diff --git a/src/main/java/JobServ/JobServClient.java b/src/main/java/JobServ/JobServClient.java
index 29c6c18..79032ab 100644
--- a/src/main/java/JobServ/JobServClient.java
+++ b/src/main/java/JobServ/JobServClient.java
@@ -160,7 +160,7 @@ public class JobServClient {
 
     // Client entrypoint
     public static void main(String[] args) throws Exception {
-        if (args.length == 1 && args[0] == "--help"){
+        if (args.length == 1 && args[0] == "help"){
             outputHelp();
         }
 
diff --git a/src/main/java/JobServ/JobServServer.java b/src/main/java/JobServ/JobServServer.java
index 20350fd..682da01 100644
--- a/src/main/java/JobServ/JobServServer.java
+++ b/src/main/java/JobServ/JobServServer.java
@@ -1,3 +1,11 @@
+/*
+ * JobServServer
+ *
+ * v1.0
+ *
+ * May 18, 2019
+ */
+
 package JobServ;
 
 import io.grpc.Server;
@@ -7,6 +15,13 @@ import io.grpc.stub.StreamObserver;
 import java.io.IOException;
 import java.util.logging.Logger;
 
+
+/*
+ * The JobServServer class implements the JobServ protobuf API
+ * It does this by extending the gRPC stub code.
+ * Additionally, JobServServer starts and manages a daemon
+ * Which accepts incoming connections from client.
+ */
 public class JobServServer {
     private static final Logger logger = Logger.getLogger(JobServServer.class.getName());
 
@@ -54,7 +69,7 @@ public class JobServServer {
 
     // wrap around stub code generated by GRPC
     static class ShellServerImpl extends ShellServerGrpc.ShellServerImplBase {
-	
+
         @Override
         public void getStatus(PIDMessage request,
                               StreamObserver<StatusMessage> responder) {
@@ -65,7 +80,7 @@ public class JobServServer {
             responder.onNext(reply);
             responder.onCompleted();
         }
-        
+
         @Override
         public void getOutput(PIDMessage request,
                               StreamObserver<OutputMessage> responder) {
@@ -76,7 +91,7 @@ public class JobServServer {
             responder.onNext(reply);
             responder.onCompleted();
         }
-        
+
         @Override
         public void newJob(NewJobMessage request,
                            StreamObserver<PIDMessage> responder) {