diff --git a/i2p2www/pages/site/get-involved/roadmap.html b/i2p2www/pages/site/get-involved/roadmap.html
index 9cbafae8..561e2c59 100644
--- a/i2p2www/pages/site/get-involved/roadmap.html
+++ b/i2p2www/pages/site/get-involved/roadmap.html
@@ -248,7 +248,7 @@ Pluginization of current apps
 </li><li>
 App improvements
 </li><li>
-Susimail and I2P-Bote stabilisation
+Susimail and I2P-Bote stabilization
 </li><li>
 Ticket triage
 </li><li>
@@ -282,10 +282,20 @@ Bug fixes, translation updates, geoip updates
 
 <h2 id="0.9.35">0.9.35</h2>
 <p><b>Target release date: Mid-late June 2018</b></p>
+<ul><li>
+Jetty 9.2.23
+</li><li>
+Tomcat 8.5.29
+</li><li>
+Susimail folders, background sending
+</li><li>
+Improved support for SSL console and eepsite
+</li><li>
+Bug fixes, translation updates, geoip updates
+</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>
 <ul><li>
-Versioning/caps props 136/137/TBD?
-</li><li>
 Debian packaging changes and improvements
 </li><li>
 Ready indication for Tails
@@ -294,29 +304,21 @@ EdDSA updates
 </li><li>
 ElGamal speedups
 </li><li>
-Fix and enable linux tray app
+Review ElGamal website docs
 </li><li>
-Private test net setup improvements
+Progress on proposal #111 (NTCP2)
 </li><li>
-Progress on proposal #123 (NTCP2)
-</li><li>
-Progress on proposal #111
+Progress on proposal #123
 (LS2 with multi-destination support)
 </li><li>
 Mac OS X installer, dock, tray enhancements (partial)
 </li><li>
-Review ElGamal website docs
+Initial research on ElGamal replacement ("new crypto" / proposal #142)
 </li><li>
-Initial research on ElGamal replacement ("new crypto")
-</li><li>
-New CSS for website front page
-</li><li>
-Capacity improvements: discussions and research
+Versioning/caps props 136/137/142/TBD
 </li><li>
 Create proposal and research multipath and path-awareness via I2CP
 </li><li>
-Tahoe site
-</li><li>
 Android gather user feedback
 </li><li>
 Android UI enhancements
@@ -329,60 +331,46 @@ Android logging improvements
 </li><li>
 Android wakelock fix
 </li><li>
-Unit test improvements
-</li><li>
-GMP 6.1.1 (ticket #1869), possibly partial
-</li><li>
-New CSS for website inner pages
-</li><li>
 Android fixes
 </li><li>
-Bote fixes
-</li><li>
 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
 </li><li>
-Susimail fixes, improvements, refactoring part 3
-</li><li>
-Continue research on ElGamal replacement ("new crypto")
-</li><li>
 Continue research on New netdb
 </li><li>
-Full support for massively popular hidden services
-</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>
+Capacity improvements: discussions and research
+</li><li>
 Streaming improvements
 </li><li>
 Performance improvements
 </li><li>
-Capacity improvements
+New CSS for website front page
 </li><li>
-NTCP Pumper redesign
-</li><li>
-I2PTunnel socket-side NIO
-</li><li>
-Android profiles
+New CSS for website inner pages
 </li><li>
 Redesigned website home page
 </li><li>
 Restructure website
 </li><li>
-Android fixes
-</li><li>
-Bote fixes
-</li>
-<li>
-Integrated chat client?
-</li>
-</ul>
+Tahoe site
+</li></ul>
 
 
 
@@ -390,20 +378,29 @@ Integrated chat client?
 <h2 id="2h2018">0.9.36 - 0.9.37 Late 2018</h2>
 <p><b>Note: To be updated</b></p>
 <ul><li>
-Complete I2PControl API 2 spec, implement in plugin (proposal #118)
+Bundle (un-pluginize) I2PControl
 </li><li>
-Bundle (un-pluginize) I2PControl with API 2 (proposal #118)
+Continue work on ElGamal replacement ("new crypto" / proposal #142)
 </li><li>
-Continue work on ElGamal replacement ("new crypto")
-</li>
-</ul>
+Integrated chat client?
+</li><li>
+Full support for massively popular hidden services (LS2 / prop 123)
+</li><li>
+Capacity improvements
+</li><li>
+NTCP Pumper redesign
+</li><li>
+I2PTunnel socket-side NIO
+</li><li>
+GMP 6.1.2 (ticket #1869), possibly partial
+</li></ul>
 
 
 <h2 id="2019">2019</h2>
 <ul><li>
-NTCP2 including new DH, AEAD (proposal #123)
+NTCP2 including new DH, AEAD (proposal #111)
 </li><li>
-LS2 with multi-destination support (proposal #111)
+LS2 with multi-destination support (proposal #123)
 </li><li>
 {% trans todo=site_url('get-involved/todo') -%}
 Reachability Mapping / handle peers partially reachable / enhanced <a href="{{ todo }}#fullRestrictedRoutes">restricted routes</a>
diff --git a/i2p2www/spec/proposals/118-i2pcontrol-api-2.rst b/i2p2www/spec/proposals/118-i2pcontrol-api-2.rst
index 2b3b4b79..6f665cc1 100644
--- a/i2p2www/spec/proposals/118-i2pcontrol-api-2.rst
+++ b/i2p2www/spec/proposals/118-i2pcontrol-api-2.rst
@@ -5,8 +5,8 @@ I2PControl API 2
     :author: hottuna
     :created: 2016-01-23
     :thread: http://zzz.i2p/topics/2030
-    :lastupdated: 2016-02-01
-    :status: Open
+    :lastupdated: 2018-03-22
+    :status: Rejected
 
 .. contents::
 
@@ -16,6 +16,8 @@ Overview
 
 This proposal outlines API2 for I2PControl.
 
+This proposal was rejected and will not be implemented, because it breaks backwards compatibility.
+See the discussion thread link for details.
 
 Developer headsup!
 ------------------