diff --git a/buildwrapper.sh b/buildwrapper.sh
index 2e9712c..c391e4c 100755
--- a/buildwrapper.sh
+++ b/buildwrapper.sh
@@ -112,11 +112,11 @@ echo "[+] Adding wrapper script for client"
 cat << EOF > staging/client/client
     ./JobServ/bin/jobserv-client private.pem client.crt ca.crt \$@
 EOF
-chmod +x staging/client/client.sh
+chmod +x staging/client/client
 
 echo "[+] Adding wrapper script for server"
 # This could also be a .desktop file without much more work.
 cat << EOF > staging/server/server
     ./JobServ/bin/jobserv-server \$1 server.crt private.pem ca.crt
 EOF
-chmod +x staging/server/server.sh
+chmod +x staging/server/server
diff --git a/src/main/java/JobServ/JobServClient.java b/src/main/java/JobServ/JobServClient.java
index 1698ac9..f348e82 100644
--- a/src/main/java/JobServ/JobServClient.java
+++ b/src/main/java/JobServ/JobServClient.java
@@ -80,7 +80,7 @@ public class JobServClient {
                            "example: ./client key.pem cert.crt ca.crt localhost 8448 return 0\n\n"+
                            "... kill (pid)"+
                            "Immediately destroys remote process"+
-                           "example: ./client key.pem cert.crt ca.crt localhost 8448 kill 0\n\n"+
+                           "example: ./client key.pem cert.crt ca.crt localhost 8448 kill 0\n\n");
     }
 
     /*
diff --git a/src/main/java/JobServ/JobServServer.java b/src/main/java/JobServ/JobServServer.java
index 5e35549..51c226a 100644
--- a/src/main/java/JobServ/JobServServer.java
+++ b/src/main/java/JobServ/JobServServer.java
@@ -39,6 +39,7 @@ public class JobServServer {
      * builds server object
      */
     public JobServServer(SslContext ssl, int port) throws IOException {
+        this.manager = new ProcessManager();
         this.server = NettyServerBuilder.forPort(port)
 	          .addService(new ShellServerService(manager))
 	          .sslContext(ssl)
diff --git a/src/main/java/JobServ/ShellServerService.java b/src/main/java/JobServ/ShellServerService.java
index 4b61fb8..953b0e1 100644
--- a/src/main/java/JobServ/ShellServerService.java
+++ b/src/main/java/JobServ/ShellServerService.java
@@ -22,7 +22,7 @@ class ShellServerService extends ShellServerGrpc.ShellServerImplBase {
      * initialized ProcessManager
      */
     public ShellServerService(ProcessManager manager) {
-        this.manager = manager
+        this.manager = manager;
     }
 
     /*