diff --git a/i2p2www/pages/site/get-involved/roadmap.html b/i2p2www/pages/site/get-involved/roadmap.html
index 849ebb72469d6792b7317a700561a71ec1bebbf2..845386a6433d4316c91627fe97ba4ce38f5dc3dc 100644
--- a/i2p2www/pages/site/get-involved/roadmap.html
+++ b/i2p2www/pages/site/get-involved/roadmap.html
@@ -320,14 +320,15 @@ Streaming improvements
 Performance improvements
 </li><li>
 NTCP Pumper improvements
+</li><li>
+EdDSA updates
 </li></ul>
 
 
 
 
 <h2 id="0.9.37">0.9.37</h2>
-<p><b>Target release date: November 2018</b></p>
-<p><b>Note: List to be updated in August 2018</b></p>
+<p><b>Target release date: Week of October 22, 2018</b></p>
 <ul><li>
 NTCP2 (enabled by default)
 </li><li>
@@ -335,11 +336,7 @@ Mac OS X installer, dock, tray enhancements
 </li><li>
 Private test net setup improvements (Docker, BSD Jails, VMs)
 </li><li>
-Unit test improvements
-</li><li>
-Android fixes
-</li><li>
-Research ElGamal speedups
+Android i2ptunnel SSL crash fix
 </li><li>
 Review ElGamal website docs
 </li><li>
@@ -347,86 +344,112 @@ ElGamal speedups
 </li><li>
 Versioning/caps props 136/137/142/TBD
 </li><li>
-Bote fixes
-</li><li>
-Android GMP 6 and 64-bit jbigi
-</li><li>
-<b>Note: Website items TBD.</b>
-</li><li>
-New CSS for website front page
-</li><li>
-New CSS for website inner pages
+Android Bote fixes
 </li><li>
 Redesigned website home page
 </li><li>
-Restructure website
+Redesigned website navigation menu
 </li><li>
 Debian packaging changes and improvements
 </li><li>
 Ready indication for Tails
 </li><li>
-EdDSA updates
+Bundle (un-pluginize) I2PControl (get OSX installer requirements) ?
 </li><li>
-Create proposal and research multipath and path-awareness via I2CP
+Continue work on ElGamal replacement ("new crypto" / proposal #142)
 </li><li>
-Android gather user feedback
+GMP 6.1.2 (ticket #1869), possibly partial?
 </li><li>
-Android UI enhancements
-</li><li>
-Android router service as a library
-</li><li>
-Android logging improvements	
+NTCP Pumper improvements
+</li></ul>
+
+
+
+<h2 id="0.9.38">0.9.38</h2>
+<p><b>Target release date: Mid-late January 2019</b></p>
+<p><b>Note: List to be updated in November 2018</b></p>
+<ul><li>
+Fixes...
+</li></ul>
+
+
+
+<h2 id="2019">2019</h2>
+<p><b>Note: List to be updated in January 2019</b></p>
+<ul><li>
+New CSS for website front page
 </li><li>
-Android wakelock fix
+New CSS for website inner pages
 </li><li>
-Android fixes
+Restructure website
 </li><li>
-Android tunnel settings
+NTCP Pumper redesign
 </li><li>
-Android profiles
+Research ElGamal speedups
 </li><li>
 Setup wizard
 </li><li>
 Continue research on New netdb
 </li><li>
+Create proposal and research multipath and path-awareness via I2CP
+</li><li>
 Initial work on new naming system, make sense of alternatives, kbuckets
 </li><li>
 Console redesign phase 2
 </li><li>
 Console UI refactor
 </li><li>
-Bundle (un-pluginize) I2PControl
+I2PTunnel socket-side NIO
+</li><li>
+LS2 with multi-destination support (proposal #123)
+</li><li>
+Full support for massively popular hidden services (LS2 / prop 123)
 </li><li>
 Integrated chat client?
 </li><li>
-Continue work on ElGamal replacement ("new crypto" / proposal #142)
+{% trans todo=site_url('get-involved/todo') -%}
+Reachability Mapping / handle peers partially reachable / enhanced <a href="{{ todo }}#fullRestrictedRoutes">restricted routes</a>
+{%- endtrans %}</li>
+<li>{% trans %}Full restricted routes{% endtrans %}</li>
+<li>{% trans %}Tunnel mixing and padding{% endtrans %}</li>
+<li>{% trans %}User defined message delays{% endtrans %}</li>
+</li></ul>
+
+
+<h2 id="2019-Bote">2019 I2P-Bote</h2>
+<p><b>Note: Developer needed</b></p>
+<ul><li>
+I2P-Bote fixes
 </li><li>
-GMP 6.1.2 (ticket #1869), possibly partial
+Android I2P-Bote fixes
 </li><li>
-NTCP Pumper improvements
+See github isses for details
 </li></ul>
 
 
-<h2 id="2019">2019</h2>
-<p><b>Note: List to be updated in November 2018 - January 2019</b></p>
+<h2 id="2019-Android">2019 Android</h2>
+<p><b>Note: Developer needed</b></p>
 <ul><li>
+Android GMP 6 and 64-bit jbigi
 </li><li>
-NTCP Pumper redesign
+Android gather user feedback
 </li><li>
-I2PTunnel socket-side NIO
+Android UI enhancements
 </li><li>
-LS2 with multi-destination support (proposal #123)
+Android router service as a library
 </li><li>
-Full support for massively popular hidden services (LS2 / prop 123)
+Android logging improvements	
 </li><li>
-{% trans todo=site_url('get-involved/todo') -%}
-Reachability Mapping / handle peers partially reachable / enhanced <a href="{{ todo }}#fullRestrictedRoutes">restricted routes</a>
-{%- endtrans %}</li>
-<li>{% trans %}Full restricted routes{% endtrans %}</li>
-<li>{% trans %}Tunnel mixing and padding{% endtrans %}</li>
-<li>{% trans %}User defined message delays{% endtrans %}</li>
+Android wakelock fix
+</li><li>
+Android fixes
+</li><li>
+Android tunnel settings
+</li><li>
+Android profiles
 </li></ul>
 
+
 <p>{% trans todo=site_url('get-involved/todo') -%}
 Please see the <a href="{{ todo }}">TODO</a> list for more detailed info about some of these tasks.
 {%- endtrans %}</p>