diff --git a/apps/routerconsole/jsp/welcome.jsp b/apps/routerconsole/jsp/welcome.jsp
index 21c6371d741bd9dd706676af11ffecb11503d086..95ce8d84f4f389af312543767ec514fa4fad7330 100644
--- a/apps/routerconsole/jsp/welcome.jsp
+++ b/apps/routerconsole/jsp/welcome.jsp
@@ -123,7 +123,10 @@
         // license info?
 %>
 <h3><%=intl._t("Why I2P?")%></h3>
-<p>TODO</p>
+<p>
+<%=intl._t("I2P is a communication tool for people who value privacy and wish to remain anonymous online.")%>
+<%=intl._t("I2P is a peer to peer network where you can browse and create hidden services.")%>
+</p>
 <%
 
     } else if (ipg == 3) {
@@ -132,9 +135,8 @@
 <h3><%=intl._t("Bandwidth Test")%></h3>
 <p>
 <%=intl._t("I2P will now test your internet connection to identify the optimal speed settings.")%>
-<%=intl._t("Applying these settings will maximize your download speed using the third-party M-Lab service.")%>
-<%=intl._t("M-Lab collects and publishes the IP address of the client that conducted the measurement.")%>
-<%=intl._t("FIXME! This is necessary to understand and describe experimental results, including to identify which Internet service provider the test was conducted from.")%>
+<%=intl._t("Bandwidth participation improves the anonymity level of all users on the network and maximizes your download speed.")%>
+<%=intl._t("This is done using the third-party M-Lab service.")%>
 <%=intl._t("Please review the M-Lab privacy policies linked below.")%>
 <%=intl._t("If you do not wish to run the M-Lab bandwidth test, you may skip it by clicking the button below.")%>
 </p><p>
@@ -231,14 +233,31 @@
         // Browser setup
 %>
 <h3><%=intl._t("Browser Setup")%></h3>
-<p>TODO</p>
+<p>
+<%=intl._t("Your browser needs to be configured to work with I2P.")%>
+<a href="TODO" target="_blank"><%=intl._t("If you want to do this yourself, here are instructions.")%></a> (browser-config link)
+<%
+        if (net.i2p.util.SystemVersion.isWindows()) {
+%>
+<%=intl._t("Otherwise, the recommended way to browse I2P websites is with a separate profile in the Firefox browser.")%>
+<ol><li><a href="TODO" target="_blank"><%=intl._t("Install Firefox")%></a>
+</li><li><a href="TODO" target="_blank"><%=intl._t("Install the I2P Firefox profile")%></a>
+</li></ol>
+<%
+        } //isWindows()
+%>
+</p>
 <%
 
     } else if (ipg == LAST_PAGE) {
         // Done
 %>
-<h3><%=intl._t("Finished")%></h3>
-<p>TODO</p>
+<h3><%=intl._t("Welcome to I2P!")%></h3>
+<p>
+<%=intl._t("When you start I2P, it may take a few minutes to bootstrap (integrate) your router into the network and find additional peers, so please be patient.")%>
+<%=intl._t("When I2P starts up, and during normal operation, I2P's tunnel build readiness indicator in the side panel may indicate that I2P is \"Rejecting Tunnels\"; this is normal behavior.")%>
+<%=intl._t("Once green stars are indicated next to your Local Tunnels, there is a wide variety of things you can do with I2P.")%>
+</p>
 <%
 
     } else {