diff --git a/Makefile b/Makefile
index e0f1deb..7d4f3fa 100644
--- a/Makefile
+++ b/Makefile
@@ -31,38 +31,6 @@ FILES		:= $(notdir $(basename $(SRCS)))
 OBJS 		:= $(addprefix $(OBJ_DIR)/,$(addsuffix .o,$(FILES)))	
 
 
-#---------------------------------------------------
-all: test
-#---------------------------------------------------
-execute: linking_s linking_c
-	@ echo execute...
-	@ ./$(TARGET1) $(ARGS)
-	@ echo ...terminate
-#---------------------------------------------------
-linking_s: $(OBJS) $(BIN_DIR)
-	@ echo linking
-	@ $(CXX) $(WFLAGS) $(OFLAG) $(TARGET1) $(OBJS)
-#---------------------------------------------------
-linking_c: $(OBJS) $(BIN_DIR)
-	@ echo linking
-	@ $(CXX) $(WFLAGS) $(OFLAG) $(TARGET2) $(OBJS)
-#---------------------------------------------------
-$(OBJ_DIR)/%.o: $(SRC_DIR)/%.c $(OBJ_DIR)
-	@ echo compile $<
-	@ $(CXX) $(WFLAGS) -c $< $(OFLAG) $@ $(INCLUDE)
-#---------------------------------------------------
-$(OBJ_DIR):
-	@ mkdir -p $(OBJ_DIR)
-#---------------------------------------------------
-$(BIN_DIR):
-	@ mkdir -p $(BIN_DIR)
-#---------------------------------------------------
-clean: 
-	@ rm -rf $(OBJ)	
-#---------------------------------------------------
-
-
-
 MKFILE_PATH := $(abspath $(lastword $(MAKEFILE_LIST)))
 MKFILE_DIR := $(dir $(mkfile_path))
 
@@ -71,20 +39,20 @@ ARGSCLIENT1			:= Test1
 ARGSCLIENT2			:= Test2
 TERMINAL_ARGS1 		:= --geometry=90x30 -e
 TERMINAL_ARGS2 		:= --geometry=10x30 -e
-# OPEN_NEW_TERMINAL	:= x-terminal-emulator
-OPEN_NEW_TERMINAL	:= kitty
+OPEN_NEW_TERMINAL	:= x-terminal-emulator
+# OPEN_NEW_TERMINAL	:= kitty
 
 test: comp
-	ipcrm --all=sem
-	ipcrm --all=msg
-	ipcrm --all=shm
+	@ ipcrm --all=sem
+	@ ipcrm --all=msg
+	@ ipcrm --all=shm
 	$(OPEN_NEW_TERMINAL) $(TERMINAL_ARGS1) $(MKFILE_DIR) $(TARGET2) $(ARGSCLIENT1)
 	$(OPEN_NEW_TERMINAL) $(TERMINAL_ARGS2) $(MKFILE_DIR) $(TARGET2) $(ARGSCLIENT2)
 	./$(TARGET1) $(ARGSSERVER)
 
 comp: server_c client_c
 	
-server_c:
+server_c: bin/F4Server
 	gcc src/F4Server.c src/custom_sem.c src/custom_shm.c src/custom_sig.c src/custom_msgq.c src/errExit.c src/forza4.c src/client.c src/server.c -o bin/F4Server  -I inc/
-client_c:
+client_c: bin/F4Client
 	gcc src/F4Client.c src/custom_sem.c src/custom_shm.c src/custom_sig.c src/custom_msgq.c src/errExit.c src/forza4.c src/client.c src/server.c -o bin/F4Client  -I inc/
\ No newline at end of file
diff --git a/TODO.txt b/TODO.txt
deleted file mode 100644
index 6ad9f49..0000000
--- a/TODO.txt
+++ /dev/null
@@ -1,15 +0,0 @@
--   sistemare include (FARE SOLO ALLA FINE ALTRIMENTI SPRECO DI TEMPO COME LA TUA VITA)
-
--   ho scoperto solo adesso che c'é set_rows ecc, forse non lho sempre usato facendo invece _ROWS = ...
-
--   messaggio speciale per abbandono
-
--   se le ipcs non si sono chiuse bene non funzia
-
--   togliere possibili errori in chiusura cosi i prof non lo vedono
-
--   printBoard stampa una righetta in piu ogni tanto
-
--   test
-
--   test2
\ No newline at end of file
diff --git a/src/F4Client.c b/src/F4Client.c
index bf9e7a1..75eb2a0 100644
--- a/src/F4Client.c
+++ b/src/F4Client.c
@@ -24,7 +24,6 @@ int generateMove();
 
 int main(int argc, char *argv[]){
     srand(time(0));
-    printf("Il mio pid per killarmi: %d\n", getpid());  //TMP
     
     setupClient(argc, argv);
 
@@ -42,7 +41,6 @@ int main(int argc, char *argv[]){
         }
         if (!strcmp(argv[2], "auto")) {
             clientBot = 1;
-            printf("sono un bot\n");
         }
     }
     strcpy(player.name_player, argv[1]);
@@ -80,7 +78,7 @@ int main(int argc, char *argv[]){
             if (!clientBot) {
                 scanf("%d", &move.move);
             } else {
-                move.move = generateMove(); //TODO:
+                move.move = generateMove();
             }
 
             move.move = checkMove(move.move - 1);
@@ -105,7 +103,8 @@ int generateMove() {
     // appena trova una colonna con spazio libero la ritorna 
     do {
         collums = rand() % _COLLUMS;
+        collums;
     } while (_BOARD[collums] != 0);
     
-    return collums;
+    return collums + 1;
 }
\ No newline at end of file
diff --git a/src/F4Server.c b/src/F4Server.c
index 9a68471..1cdd15f 100644
--- a/src/F4Server.c
+++ b/src/F4Server.c
@@ -38,8 +38,6 @@ void waitPlayer(char name[2][MAX_NAME]) {
 }
 
 int main(int argc, char *argv[]) {
-    printf("Il mio pid per killarmi: %d\n", getpid());  //FIXME: TMP
-
     setupServer(argc, argv);
 
     // aperta semaforo per connessione dei due client
@@ -75,9 +73,6 @@ int main(int argc, char *argv[]) {
     move_t move;
 
     do {
-        //FIXME: tmp
-        printf("result: %d\n", result);
-
         // apro semaforo al player di turno
         semOp(_SEMID, turn, 1);
         alarm(TIME_TO_MOVE);
diff --git a/src/client.c b/src/client.c
index 11601a6..77664d9 100644
--- a/src/client.c
+++ b/src/client.c
@@ -28,17 +28,14 @@ void setupClient(int argc, char *argv[]) {
 
     // MSGQ
     setupClientMsgq();
-    printf("msgq: %d\n", _MSGQID);
     
     // SIGNAL
     setupClientSignalHandler();
 
     // SHM
     setupClientShm();
-    printf("shm: %d\n", _SHMID);
 
     setupClientSem();
-    printf("sem: %d\n", _SEMID);
 }
 
 void checkClientinput(int argc, char *argv[]){
diff --git a/src/custom_msgq.c b/src/custom_msgq.c
index c096b8c..a33fc8b 100644
--- a/src/custom_msgq.c
+++ b/src/custom_msgq.c
@@ -6,7 +6,7 @@
 
 #include <custom_msgq.h>
 #include <errExit.h>
-#include <server.h> //FIXME: da togliere poi
+#include <server.h>
 #include <client.h>
 #include <forza4.h>
 
@@ -70,7 +70,7 @@ void msgRcv(void *msgp, size_t size, long mtype) {
     } while (errno == EINTR);
 
     if (res == -1) {
-        errExit("msgrcv", "msgRcv");        //FIXME: mi ha dato un errore una volta quando ho chiuso prima i figli e fatto ctrl+c * 2, da controllare
+        errExit("msgrcv", "msgRcv");
     }
 }
 
diff --git a/src/custom_shm.c b/src/custom_shm.c
index 70b2e30..b08f215 100644
--- a/src/custom_shm.c
+++ b/src/custom_shm.c
@@ -65,7 +65,7 @@ int getShmidServer() {
     return shmid;
 }
 
-tile_t *shmServerAt() { //FIXME: si possono fare void
+tile_t *shmServerAt() {
     tile_t *board = (tile_t *)shmat(_SHMID, NULL, 0); 
     if (board == SHMERR) {
         errExit("shmat", "shmServerAt");
@@ -83,7 +83,7 @@ tile_t * shmClientAt() {
     return board;
 } 
 
-void shmDt(void *shm_ptr) { //FIXME: sono tutte var globali
+void shmDt(void *shm_ptr) {
     if (shmdt(shm_ptr) == -1) {
         errExit("shmdt", "shmDt");
     }
diff --git a/src/forza4.c b/src/forza4.c
index 97a3ff9..23a452a 100644
--- a/src/forza4.c
+++ b/src/forza4.c
@@ -102,10 +102,10 @@ void printBoard() {
 		}
 		printf("|\n");
 	}
-	for (int i=0; i<_ROWS; i++) {
-		printf("--");
+	for (int i=0; i<_COLLUMS; i++) {
+		printf("---");
 	}
-	printf("------\n");
+	printf("--\n");
 }
 
 void printTile(tile_t t) {
diff --git a/src/server.c b/src/server.c
index c242450..323eeb4 100644
--- a/src/server.c
+++ b/src/server.c
@@ -32,7 +32,7 @@ void setupServer(int argc, char *argv[]){
     setupServerSignalHandler();
     
     // MSGQ
-    printf(PSERVER "Setting up msgq\n");    // FIXME: mettere printf nelle funzioni
+    printf(PSERVER "Setting up msgq\n");
     setupServerMsgq();
     printf("msgq: %d\n", _MSGQID);
 
@@ -84,8 +84,6 @@ void end_game(int winner){
     sndGame_end(&game_end);
     sndGame_end(&game_end);
 
-    printf("%d %d\n", _PIDS[0], _PIDS[1]);
-
     kill(_PIDS[0], SIGUSR1);
     kill(_PIDS[1], SIGUSR1);