diff --git a/installer/java/src/router.config.template b/installer/java/src/router.config.template
index 176f8872f4fcc3ccfec8ec09399f8115e863342d..f6595c2e5f16c481ba11cbb3a94af9996e01d9e0 100644
--- a/installer/java/src/router.config.template
+++ b/installer/java/src/router.config.template
@@ -176,11 +176,11 @@ clientApp.2.args=0.0.0.0 7656 i2cp.tcp.host=localhost i2cp.tcp.port=##_router_i2
 # EepProxy (HTTP proxy that lets you browse both eepsites and the normal web via squid.i2p)
 clientApp.3.main=net.i2p.i2ptunnel.I2PTunnel
 clientApp.3.name=EepProxy
-clientApp.3.args=-nogui -e "config localhost ##_router_i2cp_port##" -e "httpclient 4444"
+clientApp.3.args=-nocli -e "config localhost ##_router_i2cp_port##" -e "httpclient 4444"
 
-# Heartbeat engine (uber-simple ping/pong system, configured in heartbeat.config.  By itself
+# Heartbeat engine (ueber-simple ping/pong system, configured in heartbeat.config.  By itself
 # it just writes out stat data where its told to, but there's a seperate HeartbeatMonitor 
 # GUI to let you visualize things)
 #clientApp.4.main=net.i2p.heartbeat.Heartbeat
 #clientApp.4.name=Heartbeat
-#clientApp.4.args=heartbeat.config
\ No newline at end of file
+#clientApp.4.args=heartbeat.config
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 6d3e3fab1902791bfc89ce689c4c33b88a631816..97eee18a323c810a1cb81e41ac2c36cc10561a5b 100644
--- a/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
+++ b/router/java/src/net/i2p/router/networkdb/kademlia/KademliaNetworkDatabaseFacade.java
@@ -401,7 +401,7 @@ public class KademliaNetworkDatabaseFacade extends NetworkDatabaseFacade {
         
         // Iterate through the old failure / success count, copying over the old
         // values (if any tunnels overlap between leaseSets).  no need to be
-        // uberthreadsafe fascists here, since these values are just heuristics
+        // ueberthreadsafe fascists here, since these values are just heuristics
         if (rv != null) {
             for (int i = 0; i < rv.getLeaseCount(); i++) {
                 Lease old = rv.getLease(i);
diff --git a/router/java/src/net/i2p/router/transport/VMCommSystem.java b/router/java/src/net/i2p/router/transport/VMCommSystem.java
index 3592b41339e2d4d69f30b7688a2567fd967b9e2e..1d576c6940fed965768dd5cc0ee3f19cbf84752e 100644
--- a/router/java/src/net/i2p/router/transport/VMCommSystem.java
+++ b/router/java/src/net/i2p/router/transport/VMCommSystem.java
@@ -85,7 +85,7 @@ public class VMCommSystem extends CommSystemFacade {
             _ctx = us;
             _from = from;
             _msg = msg;
-            // bah, uberspeed!  
+            // bah, ueberspeed!  
             //getTiming().setStartAfter(us.clock().now() + 50);
         }
         public void runJob() {
@@ -123,4 +123,4 @@ public class VMCommSystem extends CommSystemFacade {
     public void startup() {
         _commSystemFacades.put(_context.routerHash(), this);
     }
-}
\ No newline at end of file
+}