diff --git a/server.js b/server.js
index 3748bbf2e769c6d9aaaa55845bbe0039cd18c86f..beddfc3c2f1929e66566f281faeb2521cd311f48 100644
--- a/server.js
+++ b/server.js
@@ -57,11 +57,10 @@ Proxy.prototype.clientConnected = function( client ) {
                 case PROTOCOL.CONTENT_CLIENTS:
                     console.log('\tRecieved request for list of [CLIENTS]');
                     // Send back a list of clients that are not currently connected to someone.
-                    var unconnectedClients = "192.168.1.77\t192.168.1.23";
+                    var unconnectedClients = "";
                     for (var key in Proxy.prototype.clientPool) {
                         if (Proxy.prototype.clientPool.hasOwnProperty(key)) {
                             var potentialClient = Proxy.prototype.clientPool[ key ];
-                            // TODO: check that this client is yourself
                             if ( potentialClient.connectedTo === undefined )
                                 unconnectedClients += "\t" + potentialClient.formattedAddress;                        
                         }
@@ -132,7 +131,7 @@ Proxy.prototype.clientConnected = function( client ) {
         if ( client.connectedTo !== undefined ) {
             connectedToClient = Proxy.prototype.clientPool[ client.connectedTo ];
             if ( connectedToClient )
-                connectedToClient.close();
+                connectedToClient.end();
             Proxy.prototype.removeClient( connectedToClient );
         }
         Proxy.prototype.removeClient( client );
@@ -154,9 +153,8 @@ Proxy.prototype.emitClientPool = function () {
     for (var key in Proxy.prototype.clientPool) {
         if (Proxy.prototype.clientPool.hasOwnProperty(key)) {
             var potentialClient = Proxy.prototype.clientPool[ key ];
-            // TODO: check that this client is yourself
             if ( potentialClient.connectedTo === undefined )
-                unconnectedClients += "\t" + potentialClient.formattedAddress;                        
+                unconnectedClients += "\t" + potentialClient.formattedAddress;
         }
     }
     // 2. Now emit that list of clients to everyone not connected to someone