diff --git a/main.c b/main.c
index bebaa1a..2fadb0e 100644
--- a/main.c
+++ b/main.c
@@ -2,6 +2,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <signal.h>
 
 #include "modules/peer.h"
 #include "modules/webio.h"
@@ -18,9 +19,13 @@ void closeSocks(void){
     closesocket(listening);
     closesocket(web_sock);
 }
+void signalClose(int n){
+    closeSocks();
+}
 
 int main(void) {
     atexit(closeSocks);
+    signal(SIGTERM,signalClose);
     Map config = config_load();
 
     Node_data mynode = construct_Mynodedata(config);
@@ -28,7 +33,7 @@ int main(void) {
 
     #if defined(WIN32)
     WSADATA ws;
-	
+
     int r1 = WSAStartup(MAKEWORD(2,2),&ws);
     if(r1 != 0){
         logger_log("Error at WSAStartup.");
@@ -74,8 +79,7 @@ int main(void) {
 
     serverThread(listening,&master,webIo,peerList1,mynode);
     if(peerList1.size >0)free(peerList1.array);
-    //Ezzel mi a baj?
-    //if(config.size > 0) free(config.pairs);
-    closeSocks();
+    if(config.size > 0) free(config.pairs);
+
     return 0;
 }
\ No newline at end of file
diff --git a/modules/peer.c b/modules/peer.c
index 3884c74..57febb8 100644
--- a/modules/peer.c
+++ b/modules/peer.c
@@ -157,7 +157,6 @@ int peer_HandleConnection(SOCKET listening, PeerList *peerList, Node_data my, fd
     char * nickname = map_getValue(m,  "nickname");
     if(map_isFound(m,"nickname")) {
         strncpy(node.nick, nickname,29);
-        logger_log("Username: %s",node.nick);
     }
     bool t = peer_ID_isFound(*peerList,node.id);
     if(t){