diff --git a/router/java/src/net/i2p/router/transport/UPnP.java b/router/java/src/net/i2p/router/transport/UPnP.java
index b8572f7262ec856850cb3b42d400a7e679e31e76..bf967db4e8daaeecb4a7939a43a5a1c718783a6f 100644
--- a/router/java/src/net/i2p/router/transport/UPnP.java
+++ b/router/java/src/net/i2p/router/transport/UPnP.java
@@ -47,9 +47,11 @@ import org.freenetproject.ForwardPortStatus;
  *
  * some code has been borrowed from Limewire : @see com.limegroup.gnutella.UPnPManager
  *
- * @see http://www.upnp.org/
- * @see http://en.wikipedia.org/wiki/Universal_Plug_and_Play
- * 
+ * @see "http://www.upnp.org/"
+ * @see "http://en.wikipedia.org/wiki/Universal_Plug_and_Play"
+ */
+
+/* 
  * TODO: Support multiple IGDs ?
  * TODO: Advertise the node like the MDNS plugin does
  * TODO: Implement EventListener and react on ip-change
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 e1e816d1aa8be6a643ccdcb959ac770d7210e9ec..4790fb1224a03931b7e0f2806058736b7336a2e1 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -386,8 +386,9 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
      * Todo:
      *   - Much better tracking of troublemakers
      *   - Disable if we have good local address or UPnP
-     *
-     * @param ip publicly routable IPv4 only
+     * 
+     * @param from Hash of inbound destination
+     * @param ourIP publicly routable IPv4 only
      * @param ourPort >= 1024
      */
     void externalAddressReceived(Hash from, byte ourIP[], int ourPort) {
diff --git a/router/java/src/org/xmlpull/v1/XmlPullParser.java b/router/java/src/org/xmlpull/v1/XmlPullParser.java
index 24a34d2de2849355cab9b374337f03fe17bc0388..076732a245265af8625862d68520c7a953e38cca 100644
--- a/router/java/src/org/xmlpull/v1/XmlPullParser.java
+++ b/router/java/src/org/xmlpull/v1/XmlPullParser.java
@@ -815,7 +815,7 @@ public interface XmlPullParser {
      * <a href="http://www.w3.org/TR/REC-xml-names/#ns-using">Namespaces in XML</a>
      * specification to "http://www.w3.org/XML/1998/namespace".
      *
-     * @param zero based index of attribute
+     * @param index zero based index of attribute
      * @return attribute namespace,
      *   empty string ("") is returned  if namesapces processing is not enabled or
      *   namespaces processing is enabled but attribute has no namespace (it has no prefix).
@@ -828,7 +828,7 @@ public interface XmlPullParser {
      * Throws an IndexOutOfBoundsException if the index is out of range
      * or current event type is not START_TAG.
      *
-     * @param zero based index of attribute
+     * @param index zero based index of attribute
      * @return attribute name (null is never returned)
      */
     String getAttributeName (int index);
@@ -840,7 +840,7 @@ public interface XmlPullParser {
      * Throws an IndexOutOfBoundsException if the index is out of range
      * or current event type is not START_TAG.
      *
-     * @param zero based index of attribute
+     * @param index zero based index of attribute
      * @return attribute prefix or null if namespaces processing is not enabled.
      */
     String getAttributePrefix(int index);
@@ -849,7 +849,7 @@ public interface XmlPullParser {
      * Returns the type of the specified attribute
      * If parser is non-validating it MUST return CDATA.
      *
-     * @param zero based index of attribute
+     * @param index zero based index of attribute
      * @return attribute type (null is never returned)
      */
     String getAttributeType(int index);
@@ -859,7 +859,7 @@ public interface XmlPullParser {
      * If parser is non-validating it MUST always return false.
      * This information is part of XML infoset:
      *
-     * @param zero based index of attribute
+     * @param index zero based index of attribute
      * @return false if attribute was in input
      */
     boolean isAttributeDefault(int index);
@@ -876,7 +876,7 @@ public interface XmlPullParser {
      *
      * @see #defineEntityReplacementText
      *
-     * @param zero based index of attribute
+     * @param index zero based index of attribute
      * @return value of attribute (null is never returned)
      */
     String getAttributeValue(int index);