diff --git a/Client.java b/Client.java
index ad96d69..8f3d5f7 100755
--- a/Client.java
+++ b/Client.java
@@ -251,7 +251,7 @@ public class Client {
 				}
 				System.out.println(String.valueOf(buffer).trim());
 				window.updateBoard(String.valueOf(buffer).trim());
-				while(boardoutput.length() < 4) {
+				while(!end && boardoutput.length() < 4) {
 					Thread.sleep(100);
 				}
 				System.out.println(boardoutput);
diff --git a/makefile b/makefile
index de4028a..7adedd8 100755
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
 # makefile
 
-all: test server
+all: test server Client.class
 
 server: Server.o
 	g++ -std=c++11 -o server Server.o Engine.o Piece.o Board.o MNode.o
@@ -12,4 +12,10 @@ test: test.o
 	g++ -std=c++11 -o test test.o Engine.o Piece.o Board.o MNode.o
 	
 test.o: test.cpp Engine.cpp Board.cpp Piece.cpp MNode.cpp
-	g++ -std=c++11 -c -g test.cpp Engine.cpp Board.cpp Piece.cpp MNode.cpp
\ No newline at end of file
+	g++ -std=c++11 -c -g test.cpp Engine.cpp Board.cpp Piece.cpp MNode.cpp
+		
+Client.class: Client.java
+	javac -g Client.java
+	
+clean:
+	$(RM) *.class *.o
\ No newline at end of file