diff --git a/cs656/lab4/ChatClient.java b/cs656/lab4/ChatClient.java
index e652857..9396142 100644
--- a/cs656/lab4/ChatClient.java
+++ b/cs656/lab4/ChatClient.java
@@ -295,14 +295,6 @@ public class ChatClient
         }
         unregister();
 
-        try
-        {
-            myPServ.leave();    /* Leave the Chord network */
-        }
-        catch (Exception e)
-        {
-            e.printStackTrace();
-        }
         System.exit(0);
     }
 
@@ -340,10 +332,10 @@ public class ChatClient
             switch (arg)
             {
                 case 0:
-                    user = s.replace(' ', '_');
+                    user = args[arg].replace(' ', '_');
                     break;
                 case 1:
-                    host = s;
+                    host = args[arg];
                     break;
                 default:
                     usage();