diff --git a/core/java/src/net/i2p/data/LeaseSet.java b/core/java/src/net/i2p/data/LeaseSet.java
index 8d5259798..7132365fa 100644
--- a/core/java/src/net/i2p/data/LeaseSet.java
+++ b/core/java/src/net/i2p/data/LeaseSet.java
@@ -188,37 +188,28 @@ public class LeaseSet extends DatabaseEntry {
      */
     @Override
     public boolean verifySignature() {
-        if (_signature == null) return false;
-        if (_destination == null) return false;
-        byte data[] = getBytes();
-        if (data == null) return false;
-        boolean signedByDest = DSAEngine.getInstance().verifySignature(_signature, data,
-                                                                       _destination.getSigningPublicKey());
-        boolean signedByRevoker = false;
-        if (!signedByDest) {
-            signedByRevoker = DSAEngine.getInstance().verifySignature(_signature, data, _signingKey);
-        }
-        return signedByDest || signedByRevoker;
+        if (super.verifySignature())
+            return true;
+
+        // Revocation unused (see above)
+        boolean signedByRevoker = DSAEngine.getInstance().verifySignature(_signature, getBytes(), _signingKey);
+        return signedByRevoker;
     }
 
     /**
      * Verify that the signature matches the lease set's destination's signing public key.
      * OR the specified revocation key.
      *
+     * @deprecated revocation unused
      * @return true only if the signature matches
      */
     public boolean verifySignature(SigningPublicKey signingKey) {
-        if (getSignature() == null) return false;
-        if (getDestination() == null) return false;
-        byte data[] = getBytes();
-        if (data == null) return false;
-        boolean signedByDest = DSAEngine.getInstance().verifySignature(_signature, data,
-                                                                       _destination.getSigningPublicKey());
-        boolean signedByRevoker = false;
-        if (!signedByDest) {
-            signedByRevoker = DSAEngine.getInstance().verifySignature(_signature, data, signingKey);
-        }
-        return signedByDest || signedByRevoker;
+        if (super.verifySignature())
+            return true;
+
+        // Revocation unused (see above)
+        boolean signedByRevoker = DSAEngine.getInstance().verifySignature(_signature, getBytes(), signingKey);
+        return signedByRevoker;
     }
 
     /**
@@ -263,6 +254,9 @@ public class LeaseSet extends DatabaseEntry {
         return rv;
     }
     
+    /**
+     *  This does NOT validate the signature
+     */
     public void readBytes(InputStream in) throws DataFormatException, IOException {
         _destination = new Destination();
         _destination.readBytes(in);
@@ -282,6 +276,9 @@ public class LeaseSet extends DatabaseEntry {
         _signature.readBytes(in);
     }
     
+    /**
+     *  This does NOT validate the signature
+     */
     public void writeBytes(OutputStream out) throws DataFormatException, IOException {
         if ((_destination == null) || (_encryptionKey == null) || (_signingKey == null) || (_leases == null)
             || (_signature == null)) throw new DataFormatException("Not enough data to write out a LeaseSet");
diff --git a/core/java/src/net/i2p/data/RouterInfo.java b/core/java/src/net/i2p/data/RouterInfo.java
index 7d6ff8a8e..8df525f6f 100644
--- a/core/java/src/net/i2p/data/RouterInfo.java
+++ b/core/java/src/net/i2p/data/RouterInfo.java
@@ -23,7 +23,6 @@ import java.util.Properties;
 import java.util.Set;
 import java.util.Vector;
 
-import net.i2p.crypto.DSAEngine;
 import net.i2p.crypto.SHA256Generator;
 import net.i2p.util.Clock;
 import net.i2p.util.Log;
@@ -215,20 +214,13 @@ public class RouterInfo extends DatabaseEntry {
 
     /**
      * Configure a set of options or statistics that the router can expose
-     *
+     * @param options if null, clears current options
      */
     public void setOptions(Properties options) {
         synchronized (_options) {
             _options.clear();
-            if (options != null) {
-                for (Iterator iter = options.keySet().iterator(); iter.hasNext();) {
-                    String name = (String) iter.next();
-                    if (name == null) continue;
-                    String val = options.getProperty(name);
-                    if (val == null) continue;
-                    _options.setProperty(name, val);
-                }
-            }
+            if (options != null)
+                _options.putAll(options);
         }
         resetCache();
     }
@@ -307,6 +299,7 @@ public class RouterInfo extends DatabaseEntry {
     /**
      * which network is this routerInfo a part of.  configured through the property
      * PROP_NETWORK_ID
+     * @return -1 if unknown
      */
     public int getNetworkId() {
         if (_options == null) return -1;
@@ -445,37 +438,26 @@ public class RouterInfo extends DatabaseEntry {
      */
     private synchronized void doValidate() {
         _validated = true;
-        if (getSignature() == null) {
-            _log.error("Signature is null");
-            _isValid = false;
-            return;
-        }
-        byte data[] = null;
-        try {
-            data = getBytes();
-        } catch (DataFormatException dfe) {
-            _log.error("Error validating", dfe);
-            _isValid = false;
-            return;
-        }
-        if (data == null) {
-            _log.error("Data could not be loaded");
-            _isValid = false;
-            return;
-        }
-        _isValid = DSAEngine.getInstance().verifySignature(_signature, data, _identity.getSigningPublicKey());
+        _isValid = super.verifySignature();
+
         if (!_isValid) {
+            byte data[] = null;
+            try {
+                data = getBytes();
+            } catch (DataFormatException dfe) {
+                _log.error("Error validating", dfe);
+                return;
+            }
             if (_log.shouldLog(Log.ERROR))
                 _log.error("Invalid [" + SHA256Generator.getInstance().calculateHash(data).toBase64()
-                           + "] w/ signing key: " + _identity.getSigningPublicKey(), 
+                           + (_log.shouldLog(Log.WARN) ? ("]\n" + toString()) : ""),
                            new Exception("Signature failed"));
-            if (_log.shouldLog(Log.DEBUG)) {
-                _log.debug("Failed data: \n" + Base64.encode(data));
-                _log.debug("Signature: " + getSignature());
-            }
         }
     }
     
+    /**
+     *  This does NOT validate the signature
+     */
     public synchronized void readBytes(InputStream in) throws DataFormatException, IOException {
         _identity = new RouterIdentity();
         _identity.readBytes(in);
@@ -510,6 +492,9 @@ public class RouterInfo extends DatabaseEntry {
         //_log.debug("Read routerInfo: " + toString());
     }
     
+    /**
+     *  This does NOT validate the signature
+     */
     public synchronized void writeBytes(OutputStream out) throws DataFormatException, IOException {
         if (_identity == null) throw new DataFormatException("Missing identity");
         if (_published < 0) throw new DataFormatException("Invalid published date: " + _published);