diff --git a/i2p2www/pages/site/get-involved/roadmap.html b/i2p2www/pages/site/get-involved/roadmap.html
index 561e2c59..02fc043e 100644
--- a/i2p2www/pages/site/get-involved/roadmap.html
+++ b/i2p2www/pages/site/get-involved/roadmap.html
@@ -250,7 +250,9 @@ App improvements
 </li><li>
 Susimail and I2P-Bote stabilization
 </li><li>
-Ticket triage
+Android stabilization and fixes
+</li><li>
+Bug fixes
 </li><li>
 User support
 </li></ul>
@@ -258,7 +260,7 @@ User support
 
 
 <h2 id="0.9.34">0.9.34</h2>
-<p><b>Target release date: Mid-April 2018</b></p>
+<p><b>Target release date: Week of April 9, 2018</b></p>
 <ul><li>
 Susimail fixes, improvements, refactoring part 2
 </li><li>
@@ -292,9 +294,36 @@ Susimail folders, background sending
 Improved support for SSL console and eepsite
 </li><li>
 Bug fixes, translation updates, geoip updates
+</li><li>
+Progress on proposal #111 (NTCP2)
+</li><li>
+Mac OS X installer, dock, tray enhancements
+</li><li>
+Android GMP 6 and 64-bit jbigi
+</li><li>
+Android fixes
+</li><li>
+Bote fixes
+</li><li>
+Private test net setup improvements (Docker, BSD Jails, VMs)
+</li><li>
+Unit test improvements
+</li><li>
+<b>Note: Website items TBD.</b>
+New CSS for website front page
+</li><li>
+New CSS for website inner pages
+</li><li>
+Redesigned website home page
+</li><li>
+Restructure website
 </li></ul>
 
-<p><b>Note: To be updated based on actual plans, everything else will be pushed to 0.9.36 or later</b></p>
+
+
+
+<h2 id="2h2018">0.9.36 - 0.9.37 Late 2018</h2>
+<p><b>Note: To be updated June 2018</b></p>
 <ul><li>
 Debian packaging changes and improvements
 </li><li>
@@ -306,13 +335,9 @@ ElGamal speedups
 </li><li>
 Review ElGamal website docs
 </li><li>
-Progress on proposal #111 (NTCP2)
-</li><li>
 Progress on proposal #123
 (LS2 with multi-destination support)
 </li><li>
-Mac OS X installer, dock, tray enhancements (partial)
-</li><li>
 Initial research on ElGamal replacement ("new crypto" / proposal #142)
 </li><li>
 Versioning/caps props 136/137/142/TBD
@@ -323,8 +348,6 @@ Android gather user feedback
 </li><li>
 Android UI enhancements
 </li><li>
-Android GMP 6 and 64-bit jbigi
-</li><li>
 Android router service as a library
 </li><li>
 Android logging improvements	
@@ -337,12 +360,6 @@ Android tunnel settings
 </li><li>
 Android profiles
 </li><li>
-Private test net setup improvements
-</li><li>
-Unit test improvements
-</li><li>
-Bote fixes
-</li><li>
 Setup wizard
 </li><li>
 Further work on pluggable transports: obfs4 as a plugin
@@ -361,23 +378,6 @@ Streaming improvements
 </li><li>
 Performance improvements
 </li><li>
-New CSS for website front page
-</li><li>
-New CSS for website inner pages
-</li><li>
-Redesigned website home page
-</li><li>
-Restructure website
-</li><li>
-Tahoe site
-</li></ul>
-
-
-
-
-<h2 id="2h2018">0.9.36 - 0.9.37 Late 2018</h2>
-<p><b>Note: To be updated</b></p>
-<ul><li>
 Bundle (un-pluginize) I2PControl
 </li><li>
 Continue work on ElGamal replacement ("new crypto" / proposal #142)