diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnThrottler.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnThrottler.java
index 5383873e9cb3718a45a115f47b70facfd413a283..edf7963fc38f2e5050047135290d9beca3d7de4f 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnThrottler.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnThrottler.java
@@ -27,7 +27,6 @@ class ConnThrottler {
     ConnThrottler(int max, int totalMax, long period) {
         _max = max;
         _totalMax = totalMax;
-        SimpleScheduler.getInstance().addPeriodicEvent(new Cleaner(), period);
         if (max > 0)
             this.counter = new ObjectCounter();
         else
@@ -36,6 +35,7 @@ class ConnThrottler {
             _currentTotal = new AtomicInteger();
         else
             _currentTotal = null;
+        SimpleScheduler.getInstance().addPeriodicEvent(new Cleaner(), period);
     }
 
     /** increments before checking */
diff --git a/build.xml b/build.xml
index 9cb1ba22360a2a61a0720c619b6c2c5643b5d648..61560873730b5a90e0d2235a499465080f6af7d4 100644
--- a/build.xml
+++ b/build.xml
@@ -722,7 +722,7 @@
 
     <!-- this is the same dependency as pkg, but with updater200 in the middle,
          since preppkg puts too much stuff in pkg-temp -->
-    <target name="release" depends="distclean, updaterWithJettyFixes, updater200WithJettyFixes, preppkg, installer" >
+    <target name="release" depends="distclean, updater, updater200, preppkg, installer" >
         <echo message="================================================================" />
         <echo message="Did you update these files?" />
         <exec executable="ls" failonerror="true">
diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java
index 58c162857d815f69be07b3c94cd02381b077f58f..00495669cbc09fbb9920c15959423a06c318646f 100644
--- a/core/java/src/net/i2p/CoreVersion.java
+++ b/core/java/src/net/i2p/CoreVersion.java
@@ -16,7 +16,7 @@ package net.i2p;
 public class CoreVersion {
     /** deprecated */
     public final static String ID = "Monotone";
-    public final static String VERSION = "0.7.13";
+    public final static String VERSION = "0.7.14";
 
     public static void main(String args[]) {
         System.out.println("I2P Core version: " + VERSION);
diff --git a/core/java/src/net/i2p/util/Translate.java b/core/java/src/net/i2p/util/Translate.java
index 40d07f76ce59c834ad88f31c894a8d8cab54125e..11fc9d45e6d4326d3a8f7ba85924278e5dde8afe 100644
--- a/core/java/src/net/i2p/util/Translate.java
+++ b/core/java/src/net/i2p/util/Translate.java
@@ -110,7 +110,7 @@ public abstract class Translate {
      *
      *  @param n how many
      *  @param s singluar string, optionally with {0} e.g. "one tunnel"
-     *  @param s plural string optionally with {0} e.g. "{0} tunnels"
+     *  @param p plural string optionally with {0} e.g. "{0} tunnels"
      *  @since 0.7.14
      */
     public static String getString(int n, String s, String p, I2PAppContext ctx, String bun) {
diff --git a/history.txt b/history.txt
index bca327011f8218192a7032e489b9c14c6df55134..7a36876bd43e80f8a1387256fec9fac6d8dbebd4 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,8 @@
+* 2010-06-07  0.7.14 released
+
+2010-06-07 zzz
+    * Misc tweaks after code review
+
 2010-06-05 zzz
     * Netdb:
       - Use new receivedAsReply flag in LeaseSet to mark
diff --git a/installer/install.xml b/installer/install.xml
index 37fe5fce19a45b50eb955cd8af77c14ac3e100a0..248e594b8da7ffa1231c57d369cae771db4d6c04 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -4,7 +4,7 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.7.13</appversion>
+        <appversion>0.7.14</appversion>
         <authors>
             <author name="I2P" email="http://forum.i2p2.de/"/>
         </authors>
diff --git a/installer/resources/initialNews.xml b/installer/resources/initialNews.xml
index 907d9f72463bbefb0c3a93198b02549f06b9a8d3..1ad5b28ad6113c3c8dd0fdf6ec33a7151758134a 100644
--- a/installer/resources/initialNews.xml
+++ b/installer/resources/initialNews.xml
@@ -1,6 +1,6 @@
 <!--
-<i2p.news date="$Date: 2010-04-27 00:00:00 $">
-<i2p.release version="0.7.13" date="2010/04/27" minVersion="0.6"/>
+<i2p.news date="$Date: 2010-06-07 00:00:00 $">
+<i2p.release version="0.7.14" date="2010/06/07" minVersion="0.6"/>
 -->
 <h4><ul><li>Congratulations on getting I2P installed!</li></ul></h4>
 <p>
diff --git a/installer/resources/news.xml b/installer/resources/news.xml
index 733875f2e79d8c51a48b183a3e232f2558f13fc9..20001e842b28bf50e0ee9ec878b535f3fe4f01a4 100644
--- a/installer/resources/news.xml
+++ b/installer/resources/news.xml
@@ -1,17 +1,20 @@
 <!--
-<i2p.news date="$Date: 2010-04-27 00:00:00 $">
-<i2p.release version="0.7.13" date="2010/04/27" minVersion="0.6" />
+<i2p.news date="$Date: 2010-06-07 00:00:00 $">
+<i2p.release version="0.7.14" date="2010/06/07" minVersion="0.6" />
 -->
-<h4><ul><li>2010-04-27: <b>0.7.13 <a href="http://www.i2p2.i2p/release-0.7.13.html">Released</a></b></li></ul></h4>
+<h4><ul><li>2010-06-07: <b>0.7.14 <a href="http://www.i2p2.i2p/release-0.7.14.html">Released</a></b></li></ul></h4>
 <p>
-The 0.7.13 release contains several changes and bug fixes to improve performance.
-It also includes improvements for the plugin support that was
-introduced in the last release.
-The new, smaller tunnel build message is enabled,
-to reduce overhead and increase build success.
-</p><p>
-Of course, there is the usual assortment of bug fixes as well.
+The 0.7.14 release contains the usual collection of bug fixes and performance tweaks.
+There are also some i2psnark improvements and more fixes for plugins.
 Upgrading is recommended.
+</p><p>
+Important note: Due to a bug in 0.7.13 and earlier releases, clicking 'Download 0.7.14 Update'
+in your router console summary bar, when you have the summary bar refresh enabled,
+may result in multiple downloads of the update. Please disable the summary bar refresh
+before clicking the download button.
+If your update policy is set to 'Download and Verify Only' (the default) then
+you should not have a problem, the router will download the file once.
+</p><p>
 Please help grow the network!
 Say hello to the volunteers on the new <a href="irc://127.0.0.1:6668/i2p-help">#i2p-help IRC channel</a>.
 Give the
diff --git a/installer/resources/themes/console/light/default.css b/installer/resources/themes/console/light/default.css
index f8a27deedaf120e53c50dd29ac20ba08b7dd0d8c..ab0e677bb939c02742268a2cd9cab4196726fe79 100644
--- a/installer/resources/themes/console/light/default.css
+++ b/installer/resources/themes/console/light/default.css
@@ -47,7 +47,6 @@ h4 {
      padding: 5px 10px;
      background: #b4c8ff url(images/tabletitlelight.png) repeat-x;
      text-transform: uppercase;
-     text-shadow: 0px 0px 2px rgba(64, 64, 255, 0.9);
      letter-spacing: 0.08em;
      -moz-box-shadow: inset 0px 0px 4px 0px #bbf;
      -moz-border-radius: 4px;
@@ -370,4 +369,4 @@ a:active{
      color: #f93;
      text-decoration: underline;
      font-weight: bold;
-}
\ No newline at end of file
+}
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 14408f1ed4aa00437ccef8702b43aba082dea759..a411b009986dc5f1f6384384ad98aeea42885422 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 18;
+    public final static long BUILD = 0;
 
     /** for example "-test" */
-    public final static String EXTRA = "-rc";
+    public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + FULL_VERSION);
diff --git a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java
index 10fc9537a9916775d931b57123327ec36bad5ad5..29592bf524cba24bca0a45221e5a7a1c0ee4b2cc 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/EventPumper.java
@@ -386,7 +386,7 @@ public class EventPumper implements Runnable {
             // don't throw an NPE if the connect is gone again
             if(chan == null)
                 return;
-            chan.configureBlocking(false);;
+            chan.configureBlocking(false);
 
             if (!_transport.allowConnection()) {
                 if (_log.shouldLog(Log.WARN))
diff --git a/router/java/src/net/i2p/router/transport/ntcp/Reader.java b/router/java/src/net/i2p/router/transport/ntcp/Reader.java
index ce21e13c315ad596f63f8b0780f58d9cd2f23652..c1029b26e5031ac2cd6b59f76c557b5e97a29545 100644
--- a/router/java/src/net/i2p/router/transport/ntcp/Reader.java
+++ b/router/java/src/net/i2p/router/transport/ntcp/Reader.java
@@ -17,6 +17,7 @@ import net.i2p.util.Log;
 class Reader {
     private RouterContext _context;
     private Log _log;
+    // TODO change to LBQ ??
     private final List<NTCPConnection> _pendingConnections;
     private List<NTCPConnection> _liveReads;
     private List<NTCPConnection> _readAfterLive;