diff --git a/core/java/src/net/i2p/stat/StatManager.java b/core/java/src/net/i2p/stat/StatManager.java
index 9670048d3..139c63b1b 100644
--- a/core/java/src/net/i2p/stat/StatManager.java
+++ b/core/java/src/net/i2p/stat/StatManager.java
@@ -51,7 +51,7 @@ public class StatManager {
      */
     public static final String DEFAULT_STAT_REQUIRED =
         "bw.recvRate,bw.sendBps,bw.sendRate,client.sendAckTime,clock.skew,crypto.elGamal.encrypt," +
-        "jobQueue.jobLag,netDb.successTime,router.fastPeers," +
+        "jobQueue.jobLag,netDb.successTime,peer.failedLookupRate,router.fastPeers," +
         "prng.bufferFillTime,prng.bufferWaitTime,router.memoryUsed," +
         "transport.receiveMessageSize,transport.sendMessageSize,transport.sendProcessingTime," +
         "tunnel.acceptLoad,tunnel.buildRequestTime,tunnel.rejectOverloaded,tunnel.rejectTimeout" +
diff --git a/history.txt b/history.txt
index b6f1a0ccf..27db1539f 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,12 @@
+2009-12-31 zzz
+    * BuildResponseRecord: Make static
+    * i2np: Remove unused logs
+    * i2psnark: Fix message box, was a little too small
+    * InternalSocket: Fallback to external socket on fail
+    * NetDb: Fix exploration by adding a null hash to mean
+      "don't give me floodfills"
+    * PeerSelector: Downgrade floodfills with high fail rate
+
 2009-12-26 zzz
     * Console:
       - Tag the rest of logs.jsp
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 3e5e8985d..983dd2f06 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 = 12;
+    public final static long BUILD = 13;
     /** for example "-test" */
     public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
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 5e32409e5..fe3c75485 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/SearchJob.java
@@ -532,7 +532,7 @@ class SearchJob extends JobImpl {
     void replyFound(DatabaseSearchReplyMessage message, Hash peer) {
         long duration = _state.replyFound(peer);
         // this processing can take a while, so split 'er up
-        getContext().jobQueue().addJob(new SearchReplyJob(getContext(), this, (DatabaseSearchReplyMessage)message, peer, duration));
+        getContext().jobQueue().addJob(new SearchReplyJob(getContext(), this, message, peer, duration));
     }
     
     /**
diff --git a/router/java/src/net/i2p/router/peermanager/TunnelHistory.java b/router/java/src/net/i2p/router/peermanager/TunnelHistory.java
index bdf352501..208415ca0 100644
--- a/router/java/src/net/i2p/router/peermanager/TunnelHistory.java
+++ b/router/java/src/net/i2p/router/peermanager/TunnelHistory.java
@@ -28,13 +28,13 @@ public class TunnelHistory {
     private RateStat _failRate;
     private String _statGroup;
     
-    /** probabalistic tunnel rejection due to a flood of requests */
+    /** probabalistic tunnel rejection due to a flood of requests - essentially unused */
     public static final int TUNNEL_REJECT_PROBABALISTIC_REJECT = 10;
-    /** tunnel rejection due to temporary cpu/job/tunnel overload */
+    /** tunnel rejection due to temporary cpu/job/tunnel overload - essentially unused */
     public static final int TUNNEL_REJECT_TRANSIENT_OVERLOAD = 20;
     /** tunnel rejection due to excess bandwidth usage */
     public static final int TUNNEL_REJECT_BANDWIDTH = 30;
-    /** tunnel rejection due to system failure */
+    /** tunnel rejection due to system failure - essentially unused */
     public static final int TUNNEL_REJECT_CRIT = 50;
     
     public TunnelHistory(RouterContext context, String statGroup) {
@@ -100,8 +100,10 @@ public class TunnelHistory {
         }
     }
 
-    // Define this rate as the probability it really failed
-    // @param pct = probability * 100
+    /**
+     * Define this rate as the probability it really failed
+     * @param pct = probability * 100
+     */
     public void incrementFailed(int pct) {
         _lifetimeFailed++;
         _failRate.addData(pct, 1);
@@ -150,7 +152,7 @@ public class TunnelHistory {
         _failRate.store(out, "tunnelHistory.failRate");
     }
     
-    private void add(StringBuilder buf, String name, long val, String description) {
+    private static void add(StringBuilder buf, String name, long val, String description) {
         buf.append("# ").append(name.toUpperCase()).append(NL).append("# ").append(description).append(NL);
         buf.append("tunnels.").append(name).append('=').append(val).append(NL).append(NL);
     }
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 2868440e9..c5d5e6106 100644
--- a/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
+++ b/router/java/src/net/i2p/router/transport/udp/UDPTransport.java
@@ -1170,6 +1170,7 @@ public class UDPTransport extends TransportImpl implements TimedWeightedPriority
                 _introducersSelectedOn = _context.clock().now();
                 introducersIncluded = true;
             } else {
+                // maybe we should fail to publish an address at all in this case?
                 if (_log.shouldLog(Log.WARN))
                     _log.warn("Need introducers but we don't know any");
             }
diff --git a/router/java/src/net/i2p/router/networkdb/kademlia/RouterGenerator.java b/router/java/test/net/i2p/router/networkdb/kademlia/RouterGenerator.java
similarity index 100%
rename from router/java/src/net/i2p/router/networkdb/kademlia/RouterGenerator.java
rename to router/java/test/net/i2p/router/networkdb/kademlia/RouterGenerator.java