diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
index 6c4f1bae6..a2e82d696 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -1298,7 +1298,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
 
     /**
      *  Is the key in the negative lookup cache?
-     *&
+     *
      *  @param key for Destinations or RouterIdentities
      *  @since 0.9.4 moved from FNDF to KNDF in 0.9.16
      */
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
index 272ed743b..6ebfae9df 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
@@ -153,6 +153,7 @@ class SearchJob extends JobImpl {
     }
 ***/
     
+    /** timeout */
     static final int PER_FLOODFILL_PEER_TIMEOUT = 10*1000;
     static final long MIN_TIMEOUT = 2500;
     
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java b/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java
index cbe5037a8..8404d996d 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/StoreState.java
@@ -79,6 +79,7 @@ class StoreState {
     }
 ****/
 
+    /** getFailed */
     public Set<Hash> getFailed() { 
         synchronized (_failedPeers) {
             return new HashSet<Hash>(_failedPeers); 
diff --git a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
index bdfb3385c..b45be2d96 100644
--- a/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
+++ b/router/java/src/net/i2p/router/startup/LoadClientAppsJob.java
@@ -197,7 +197,7 @@ public class LoadClientAppsJob extends JobImpl {
      *  @param clientName can be null
      *  @param args can be null
      *  @param cl can be null
-     *  @throws just about anything, caller would be wise to catch Throwable
+     *  @throws Exception just about anything, caller would be wise to catch Throwable
      *  @since 0.7.14
      */
     public static void runClientInline(String className, String clientName, String args[],
diff --git a/router/java/src/net/i2p/router/startup/WorkingDir.java b/router/java/src/net/i2p/router/startup/WorkingDir.java
index 9d4fb5128..5c9b9192e 100644
--- a/router/java/src/net/i2p/router/startup/WorkingDir.java
+++ b/router/java/src/net/i2p/router/startup/WorkingDir.java
@@ -41,8 +41,6 @@ import net.i2p.util.SystemVersion;
  * After migration, the router will run using the new directory.
  * The wrapper, however, must be stopped and restarted from the new script - until then,
  * it will continue to write to wrapper.log* in the old directory.
- *
- * @param whether to copy all data over from an existing install
  */
 public class WorkingDir {
 
@@ -63,6 +61,8 @@ public class WorkingDir {
      * Caller should store the return value for future reference.
      *
      * This also redirects stdout and stderr to a wrapper.log file if there is no wrapper present.
+     *
+     * @param migrateOldConfig whether to copy all data over from an existing install
      */
     public static String getWorkingDir(Properties envProps, boolean migrateOldConfig) {
         String dir = null;
diff --git a/router/java/src/net/i2p/router/transport/UPnP.java b/router/java/src/net/i2p/router/transport/UPnP.java
index 52637cec9..767bc12ba 100644
--- a/router/java/src/net/i2p/router/transport/UPnP.java
+++ b/router/java/src/net/i2p/router/transport/UPnP.java
@@ -51,7 +51,7 @@ import org.freenetproject.ForwardPortStatus;
  *
  * ==================
  *
- * This plugin implements UP&P support on a Freenet node.
+ * This plugin implements UP&amp;P support on a Freenet node.
  * 
  * @author Florent Daigni&egrave;re &lt;nextgens@freenetproject.org&gt;
  *
diff --git a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
index a5ac126bc..4e80c3657 100644
--- a/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
+++ b/router/java/src/net/i2p/router/tunnel/TunnelDispatcher.java
@@ -916,6 +916,7 @@ public class TunnelDispatcher implements Service {
     }
 ******/
 
+    /** startup */
     public synchronized void startup() {
         // Note that we only use the validator for participants and OBEPs, not IBGWs, so
         // this BW estimate will be high by about 33% assuming 2-hop tunnels average
diff --git a/router/java/src/net/i2p/router/util/RandomIterator.java b/router/java/src/net/i2p/router/util/RandomIterator.java
index 2baa221c0..b4252eb39 100644
--- a/router/java/src/net/i2p/router/util/RandomIterator.java
+++ b/router/java/src/net/i2p/router/util/RandomIterator.java
@@ -25,7 +25,7 @@ import net.i2p.util.SystemVersion;
  * Here is a sample on how to use the code:
  *
     <pre>
-        for(Iterator<Object> iter = new RandomIterator<Object>(myObjList); iter.hasNext();){
+        for(Iterator&lt;Object&gt; iter = new RandomIterator&lt;Object&gt;(myObjList); iter.hasNext();){
             Object o = iter.next();
             if(someCondition(o) )
                 return o; // iteration stopped early
diff --git a/router/java/src/org/xlattice/crypto/filters/BloomSHA1.java b/router/java/src/org/xlattice/crypto/filters/BloomSHA1.java
index 6320f43f3..59d9fb9e6 100644
--- a/router/java/src/org/xlattice/crypto/filters/BloomSHA1.java
+++ b/router/java/src/org/xlattice/crypto/filters/BloomSHA1.java
@@ -27,7 +27,7 @@ import java.util.concurrent.LinkedBlockingQueue;
  * This class is designed to be thread-safe, but this has not been
  * exhaustively tested.
  *
- * @author < A HREF="mailto:jddixon@users.sourceforge.net">Jim Dixon</A>
+ * @author <A HREF="mailto:jddixon@users.sourceforge.net">Jim Dixon</A>
  * 
  * BloomSHA1.java and KeySelector.java are BSD licensed from the xlattice
  * app - http://xlattice.sourceforge.net/