diff --git a/src/ClientMain.java b/src/ClientMain.java
index 607905026543e20433e37ae9b5eb919c3c4b531a..dc61bdb0abb574bae424f866cd17efa21c6ff3a4 100644
--- a/src/ClientMain.java
+++ b/src/ClientMain.java
@@ -17,7 +17,7 @@ public class ClientMain {
 		if (!uploadFolder.exists())
 			throw new RuntimeException("to_store folder does not exist");
 		
-		// testClient(cport, timeout, downloadFolder);
+		testClient(cport, timeout, downloadFolder);
 		
 		// example to launch a number of concurrent clients, each doing the same operations
 		for (int i = 0; i < 10; i++) {
diff --git a/src/Dstore.java b/src/Dstore.java
index b930b89e90e234e9baa7a559ca4aa4e4f61601d7..fce2b56c3f35f5f564151e29dbd4c9c32d84a93b 100644
--- a/src/Dstore.java
+++ b/src/Dstore.java
@@ -184,8 +184,6 @@ public class Dstore {
         PrintWriter res = new PrintWriter(new OutputStreamWriter(out));
         String line;
 
-        System.out.println("Entered controller req");
-
         while((line = req.readLine()) != null) {
             String[] tokens = line.split(" ");
             String command = tokens[0];
diff --git a/src/Server.java b/src/Server.java
index 3d573bf6455b1e1b286d1c0e4e8a5dc891eec682..4e7c1a1b98c945d771d7dd80a5e2ab5eba9f3c36 100644
--- a/src/Server.java
+++ b/src/Server.java
@@ -193,6 +193,7 @@ public class Server {
                 res.println("ERROR_FILE_DOES_NOT_EXIST");
             } else {
                 // select a Dstore from there and give an appropriate error if all Dstores fail
+                // #TODO fix NullPointerException from here
                 res.println("LOAD_FROM " + fileSystem.getStore().get(filename).get(pos).getPublicPort() +
                         " " + fileSystem.getFileSizes().get(filename));
             }