diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java
index 51425cbd013ad052eda1d8a509f7a34ef516e5c9..656b2c0f96e1a50df32623de1c461b295b8baaa7 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientRunner.java
@@ -33,6 +33,9 @@ public class I2PTunnelHTTPClientRunner extends I2PTunnelRunner {
         super(s, i2ps, slock, initialI2PData, null, sockList, onFail);
     }
 
+    /**
+     *  Only call once!
+     */
     @Override
     protected OutputStream getSocketOut() throws IOException { 
         OutputStream raw = super.getSocketOut();
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java
index fb620a1ad3da0cc12456571c2e6bca1e55dbd12b..9ac4f739122b5f52ebc6f992ebe4f9e8c52cfeb0 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillRouterInfoFloodJob.java
@@ -21,6 +21,7 @@ import net.i2p.util.Log;
  * Also called when opting out of ff to call off the hounds ASAP.
  * Currently floods FNDF.MAX_TO_FLOOD * 2 routers nearest to us.
  *
+ * @since 0.9.21
  */
 class FloodfillRouterInfoFloodJob extends JobImpl {
     private final Log _log;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
index 5618d256459f57a592b44571a4f339c8bb4aaa98..b7ad0465fa721fe927dc18359ecdceaf5cb1a46c 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/FloodfillStoreJob.java
@@ -20,6 +20,8 @@ import net.i2p.util.Log;
 /**
  *  This extends StoreJob to fire off a FloodfillVerifyStoreJob after success.
  *
+ *  Stores through this class always request a reply.
+ *
  */
 class FloodfillStoreJob extends StoreJob {    
     private final FloodfillNetworkDatabaseFacade _facade;
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
index 809b9601541ae0efeeaa64a47803ab99f872a252..2845de561425914312378847c3de7e7f80bf9ba9 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreJob.java
@@ -33,6 +33,8 @@ import net.i2p.util.Log;
 import net.i2p.util.VersionComparator;
 
 /**
+ *  Stores through this always request a reply.
+ *
  *  Unused directly - see FloodfillStoreJob
  */
 class StoreJob extends JobImpl {
diff --git a/router/java/src/net/i2p/router/peermanager/PeerManager.java b/router/java/src/net/i2p/router/peermanager/PeerManager.java
index bb88fed790c96492c2b081c7ed898edcfa0808b9..8061a251775c3bddfaf66c59ac4ae772b93d396d 100644
--- a/router/java/src/net/i2p/router/peermanager/PeerManager.java
+++ b/router/java/src/net/i2p/router/peermanager/PeerManager.java
@@ -193,7 +193,8 @@ class PeerManager {
     }
     
     /**
-     * Find some peers that meet the criteria and we have the netDb info for locally
+     * Find some peers that meet the criteria and we have the netDb info for locally.
+     * Returned list will not include ourselves.
      *
      * Only used by PeerTestJob (PURPOSE_TEST)
      */
diff --git a/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java b/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java
index 68ad4e046f7939cf837350d92ecc8ed4130b8851..6bb81fbc8c2061bd7de46ae8012a207c06609b73 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/ExploratoryPeerSelector.java
@@ -24,7 +24,7 @@ class ExploratoryPeerSelector extends TunnelPeerSelector {
         super(context);
     }
 
-	public List<Hash> selectPeers(TunnelPoolSettings settings) {
+    public List<Hash> selectPeers(TunnelPoolSettings settings) {
         Log l = ctx.logManager().getLog(getClass());
         int length = getLength(settings);
         if (length < 0) {