diff --git a/router/java/src/com/southernstorm/noise/protocol/SymmetricState.java b/router/java/src/com/southernstorm/noise/protocol/SymmetricState.java
index 398f0bc9eb07cacdf420472f4ec86c142ba39362..5f676f84b61bf021bf4ef7d763e829d0d43471b0 100644
--- a/router/java/src/com/southernstorm/noise/protocol/SymmetricState.java
+++ b/router/java/src/com/southernstorm/noise/protocol/SymmetricState.java
@@ -72,7 +72,6 @@ class SymmetricState implements Destroyable {
 	 * Constructs a new symmetric state object.
 	 * Noise protocol name is hardcoded.
 	 * 
-	 * @param protocolName The name of the Noise protocol, which is assumed to be valid.
 	 * @param cipherName The name of the cipher within protocolName.
 	 * @param hashName The name of the hash within protocolName.
 	 * 
diff --git a/router/java/src/net/i2p/data/router/RouterInfo.java b/router/java/src/net/i2p/data/router/RouterInfo.java
index 95b8ed728db95a9c0db1568cbc3d4a8ae6317069..7d49b9a925fde5cbc7c90a491f19b971fa65dc58 100644
--- a/router/java/src/net/i2p/data/router/RouterInfo.java
+++ b/router/java/src/net/i2p/data/router/RouterInfo.java
@@ -157,11 +157,9 @@ public class RouterInfo extends DatabaseEntry {
     }
 
     /**
-     * Retrieve the approximate date on which the info was published 
-     * (essentially a version number for the routerInfo structure, except that
-     * it also contains freshness information - whether or not the router is
-     * currently publishing its information).  This should be used to help expire
-     * old routerInfo structures
+     * Retrieve the timestamp on which the info was published,
+     * essentially a version number for the RouterInfo.
+     * This should be used to expire old RouterInfo structures.
      *
      */
     public long getPublished() {
diff --git a/router/java/src/net/i2p/router/OutNetMessage.java b/router/java/src/net/i2p/router/OutNetMessage.java
index fc6f8b71b8b91de174be9ecbbe4fbc515bacfba4..3c0a77a2bb04c61c9a87de89bc26981215b06e12 100644
--- a/router/java/src/net/i2p/router/OutNetMessage.java
+++ b/router/java/src/net/i2p/router/OutNetMessage.java
@@ -371,12 +371,12 @@ public class OutNetMessage implements CDPQEntry {
             buf.append(getMessageType());
             buf.append(" ID ").append(_messageId);
         }
-        buf.append(" expiring on ").append(new Date(_expiration));
+        buf.append(" expiring ").append(new Date(_expiration));
         buf.append(" priority ").append(_priority);
         if (_failedTransports != null)
-            buf.append(" failed delivery on transports ").append(_failedTransports);
+            buf.append(" failed transports: ").append(_failedTransports);
         if (_target == null)
-            buf.append(" targetting no one in particular...");
+            buf.append(" (null target)");
         else
             buf.append(" targetting ").append(_target.getIdentity().getHash().toBase64());
         if (_onReply != null)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a411b009986dc5f1f6384384ad98aeea42885422..87e5bffca0684477c0ba8daee48da05fbea99f44 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
 
     /** for example "-test" */
     public final static String EXTRA = "";
diff --git a/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java b/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java
index c49a4cf413b92c6d5a0972509f1f4713f6adca5e..8fd8da26ff6dfb399688b785bf027ae2f43c182f 100644
--- a/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java
+++ b/router/java/src/net/i2p/router/transport/crypto/DHSessionKeyBuilder.java
@@ -572,8 +572,7 @@ public class DHSessionKeyBuilder {
          */
         public void returnUnused(DHSessionKeyBuilder builder) {
             if (builder.getPeerPublicValue() != null) {
-                if (_log.shouldLog(Log.WARN))
-                    _log.warn("builder returned used");
+                _log.error("builder returned used", new Exception());
                 return;
             }
             _context.statManager().addRateData("crypto.DHReused", 1);
diff --git a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
index e88ce2c646ec5416af0eb3c4d0cf0d4865847c43..ddc386269910e6a48ccf47fb31b2cd0a2f72e950 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -310,7 +310,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
         int port = getRequestedPort();
         if (port < 0) {
             port = UDPEndpoint.selectRandomPort(_context);
-            Map<String, String> changes = new HashMap<String, String>();
+            Map<String, String> changes = new HashMap<String, String>(2);
             changes.put(PROP_INTERNAL_PORT, Integer.toString(port));
             changes.put(PROP_EXTERNAL_PORT, Integer.toString(port));
             _context.router().saveConfig(changes, null);
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
index 5f884f987a73f78c2821c7c9a703519840be462f..e9da3c72ae0c2e919b3103b7cf96b1ed3d66acc6 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
@@ -305,7 +305,7 @@ public class TunnelPool {
     /**
      * Return a list of tunnels in the pool
      *
-     * @return list of TunnelInfo objects
+     * @return A copy of the list of TunnelInfo objects
      */
     public List<TunnelInfo> listTunnels() {
         synchronized (_tunnels) {