12 files changed, 808 insertions, 481 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bf709e72..ed934c01 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 2.6.0)
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
+if(UNIX)
+        find_package(Curses REQUIRED)
+endif()
+
 if(NOT WIN32)
         option(USE_NACL "Use NaCl library instead of libsodium")
 endif()
diff --git a/INSTALL.md b/INSTALL.md
index d6a5b3f9..625a9c6d 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -18,6 +18,14 @@ Build dependencies:
 ```bash
 apt-get install build-essential libtool autotools-dev automake libconfig-dev ncurses-dev cmake checkinstall
 ```
+
+On Fedora:
+
+```bash
+yum groupinstall "Development Tools"
+yum install libtool autoconf automake libconfig-devel ncurses-devel cmake
+```
+
 Note that `libconfig-dev` should be >= 1.4.
 
 You should get and install [libsodium](https://github.com/jedisct1/libsodium):
@@ -31,6 +39,20 @@ sudo checkinstall --install --pkgname libsodium --pkgversion 0.4.2 --nodoc
 sudo ldconfig
 ```
 
+Or if checkinstall is not easily available for your distribution (e.g. Fedora), 
+this will install the libs to /usr/local/lib and the headers to /usr/local/include:
+
+```bash
+git clone git://github.com/jedisct1/libsodium.git
+cd libsodium
+git checkout tags/0.4.2
+./autogen.sh
+./configure
+make check
+sudo make install
+```
+
+
 Then clone this repo and generate makefile:
 ```bash
 git clone git://github.com/irungentoo/ProjectTox-Core.git
diff --git a/core/DHT.c b/core/DHT.c
index 272641ee..6972fdeb 100644
--- a/core/DHT.c
+++ b/core/DHT.c
@@ -64,12 +64,12 @@
 typedef struct {
     uint8_t     client_id[CLIENT_ID_SIZE];
     IP_Port     ip_port;
-    uint32_t    timestamp;
-    uint32_t    last_pinged;
+    uint64_t    timestamp;
+    uint64_t    last_pinged;
 
     /* Returned by this node. Either our friend or us */
     IP_Port     ret_ip_port;
-    uint32_t    ret_timestamp;
+    uint64_t    ret_timestamp;
 } Client_data;
 
 typedef struct {
@@ -77,17 +77,17 @@ typedef struct {
     Client_data client_list[MAX_FRIEND_CLIENTS];
 
     /* time at which the last get_nodes request was sent. */
-    uint32_t    lastgetnode;
+    uint64_t    lastgetnode;
 
     /* Symetric NAT hole punching stuff */
 
     /* 1 if currently hole punching, otherwise 0 */
     uint8_t     hole_punching; 
     uint32_t    punching_index;
-    uint32_t    punching_timestamp;
-    int64_t     recvNATping_timestamp;
+    uint64_t    punching_timestamp;
+    uint64_t    recvNATping_timestamp;
     uint64_t    NATping_id;
-    uint32_t    NATping_timestamp;
+    uint64_t    NATping_timestamp;
 } Friend;
 
 typedef struct {
@@ -98,7 +98,7 @@ typedef struct {
 typedef struct {
     IP_Port     ip_port;
     uint64_t    ping_id;
-    int64_t     timestamp;
+    uint64_t    timestamp;
 } Pinged;
 
 /*----------------------------------------------------------------------------------*/
@@ -115,30 +115,38 @@ static Pinged       send_nodes[LSEND_NODES_ARRAY];
 /*----------------------------------------------------------------------------------*/
 
 /* Compares client_id1 and client_id2 with client_id
-   return 0 if both are same distance
-   return 1 if client_id1 is closer
-   return 2 if client_id2 is closer */
-int id_closest(uint8_t * client_id, uint8_t * client_id1, uint8_t * client_id2) /* tested */
+ * return 0 if both are same distance
+ * return 1 if client_id1 is closer
+ * return 2 if client_id2 is closer
+ */
+int id_closest(uint8_t * client_id, uint8_t * client_id1, uint8_t * client_id2)
 {
     uint32_t i;
+    uint8_t tmp1, tmp2;
+
     for(i = 0; i < CLIENT_ID_SIZE; ++i) {
-        if(abs(client_id[i] ^ client_id1[i]) < abs(client_id[i] ^ client_id2[i]))
+        tmp1 = abs(client_id[i] ^ client_id1[i]);
+        tmp2 = abs(client_id[i] ^ client_id2[i]);
+        
+        if(tmp1 < tmp2)
             return 1;
-        else if(abs(client_id[i] ^ client_id1[i]) > abs(client_id[i] ^ client_id2[i]))
+        else if(tmp1 > tmp2)
             return 2;
     }
     return 0;
 }
 
 /* check if client with client_id is already in list of length length.
-   if it is set it's corresponding timestamp to current time.
-   if the id is already in the list with a different ip_port, update it.
-   return True(1) or False(0)
-   TODO: maybe optimize this. */
+ * if it is then set its corresponding timestamp to current time.
+ * if the id is already in the list with a different ip_port, update it.
+ * return True(1) or False(0)
+ *
+ * TODO: maybe optimize this.
+ */
 int client_in_list(Client_data * list, uint32_t length, uint8_t * client_id, IP_Port ip_port)
 {
     uint32_t i;
-    int64_t temp_time = unix_time();
+    uint64_t temp_time = unix_time();
 
     for(i = 0; i < length; ++i) {
         /*If ip_port is assigned to a different client_id replace it*/
@@ -156,83 +164,131 @@ int client_in_list(Client_data * list, uint32_t length, uint8_t * client_id, IP_
         }
     }
     return 0;
-
 }
 
 /* check if client with client_id is already in node format list of length length.
-   return True(1) or False(0) */
+ * return True(1) or False(0)
+ */
 int client_in_nodelist(Node_format * list, uint32_t length, uint8_t * client_id)
 {
     uint32_t i;
-    for(i = 0; i < length; ++i)
+    for(i = 0; i < length; ++i) {
         if(memcmp(list[i].client_id, client_id, CLIENT_ID_SIZE) == 0)
             return 1;
+    }
     return 0;
 }
 
-/*Return the friend number from the client_id
- Return -1 if failure, number of friend if success*/
+/* Returns the friend number from the client_id, or -1 if a failure occurs
+ */
 static int friend_number(uint8_t * client_id)
 {
     uint32_t i;
-    for(i = 0; i < num_friends; ++i)
-        if(memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) /* Equal */
+    for(i = 0; i < num_friends; ++i) {
+        if(memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0)
             return i;
+    }
     return -1;
 }
 
 /* Find MAX_SENT_NODES nodes closest to the client_id for the send nodes request:
-   put them in the nodes_list and return how many were found.
-   TODO: Make this function much more efficient. */
+ * put them in the nodes_list and return how many were found.
+ *
+ * TODO: For the love of based Allah make this function cleaner and much more efficient.
+ */
 int get_close_nodes(uint8_t * client_id, Node_format * nodes_list)
 {
-    uint32_t i, j, k;
-    int num_nodes=0;
-    int64_t temp_time = unix_time();
-    for(i = 0; i < LCLIENT_LIST; ++i)
-        if(close_clientlist[i].timestamp + BAD_NODE_TIMEOUT > temp_time &&
-           !client_in_nodelist(nodes_list, MAX_SENT_NODES,close_clientlist[i].client_id)) {
-            /* if node is good and not already in list. */
+    uint32_t    i, j, k;
+    uint64_t     temp_time = unix_time();
+    int         num_nodes = 0, closest, tout, inlist;
+
+    for (i = 0; i < LCLIENT_LIST; ++i) {
+        tout = close_clientlist[i].timestamp <= temp_time - BAD_NODE_TIMEOUT;
+        inlist = client_in_nodelist(nodes_list, MAX_SENT_NODES, close_clientlist[i].client_id);
+
+        /* if node isn't good or is already in list. */
+        if(tout || inlist)
+            continue;
+
+        if(num_nodes < MAX_SENT_NODES) {
+
+            memcpy( nodes_list[num_nodes].client_id, 
+                    close_clientlist[i].client_id, 
+                    CLIENT_ID_SIZE );
+
+            nodes_list[num_nodes].ip_port = close_clientlist[i].ip_port;
+            num_nodes++;
+        } else {
+            for(j = 0; j < MAX_SENT_NODES; ++j) {
+                closest = id_closest(   client_id, 
+                                        nodes_list[j].client_id, 
+                                        close_clientlist[i].client_id );
+                if(closest == 2) {
+                    memcpy( nodes_list[j].client_id, 
+                            close_clientlist[i].client_id, 
+                            CLIENT_ID_SIZE);
+
+                    nodes_list[j].ip_port = close_clientlist[i].ip_port;
+                    break;
+                }
+            }
+        }
+    }
+
+    for(i = 0; i < num_friends; ++i) {
+        for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
+            tout = friends_list[i].client_list[j].timestamp <= temp_time - BAD_NODE_TIMEOUT;
+            inlist = client_in_nodelist(    nodes_list,
+                                            MAX_SENT_NODES, 
+                                            friends_list[i].client_list[j].client_id);
+
+            /* if node isn't good or is already in list. */
+            if(tout || inlist)
+                continue;
+
             if(num_nodes < MAX_SENT_NODES) {
-                memcpy(nodes_list[num_nodes].client_id, close_clientlist[i].client_id, CLIENT_ID_SIZE);
-                nodes_list[num_nodes].ip_port = close_clientlist[i].ip_port;
+
+                memcpy( nodes_list[num_nodes].client_id, 
+                        friends_list[i].client_list[j].client_id, 
+                        CLIENT_ID_SIZE);
+
+                nodes_list[num_nodes].ip_port = friends_list[i].client_list[j].ip_port;
                 num_nodes++;
-            } else for(j = 0; j < MAX_SENT_NODES; ++j)
-                    if(id_closest(client_id, nodes_list[j].client_id, close_clientlist[i].client_id) == 2) {
-                        memcpy(nodes_list[j].client_id, close_clientlist[i].client_id, CLIENT_ID_SIZE);
-                        nodes_list[j].ip_port = close_clientlist[i].ip_port;
+            } else  {
+                for(k = 0; k < MAX_SENT_NODES; ++k) {
+
+                    closest = id_closest(   client_id, 
+                                            nodes_list[k].client_id, 
+                                            friends_list[i].client_list[j].client_id );
+                    if(closest == 2) {
+                        memcpy( nodes_list[k].client_id, 
+                                friends_list[i].client_list[j].client_id, 
+                                CLIENT_ID_SIZE );
+
+                        nodes_list[k].ip_port = friends_list[i].client_list[j].ip_port;
                         break;
                     }
-        }
-
-    for(i = 0; i < num_friends; ++i)
-        for(j = 0; j < MAX_FRIEND_CLIENTS; ++j)
-            if(friends_list[i].client_list[j].timestamp + BAD_NODE_TIMEOUT > temp_time &&
-               !client_in_nodelist(nodes_list, MAX_SENT_NODES,friends_list[i].client_list[j].client_id)) {
-                /* if node is good and not already in list. */
-                if(num_nodes < MAX_SENT_NODES) {
-                    memcpy(nodes_list[num_nodes].client_id, friends_list[i].client_list[j].client_id, CLIENT_ID_SIZE);
-                    nodes_list[num_nodes].ip_port = friends_list[i].client_list[j].ip_port;
-                    num_nodes++;
-                } else for(k = 0; k < MAX_SENT_NODES; ++k)
-                        if(id_closest(client_id, nodes_list[k].client_id, friends_list[i].client_list[j].client_id) == 2) {
-                            memcpy(nodes_list[k].client_id, friends_list[i].client_list[j].client_id, CLIENT_ID_SIZE);
-                            nodes_list[k].ip_port = friends_list[i].client_list[j].ip_port;
-                            break;
-                        }
+                }
             }
+        }
+    }
     return num_nodes;
 }
 
 /* replace first bad (or empty) node with this one
-   return 0 if successful
-   return 1 if not (list contains no bad nodes) */
-int replace_bad(Client_data * list, uint32_t length, uint8_t * client_id, IP_Port ip_port) /* tested */
+ * return 0 if successful
+ * return 1 if not (list contains no bad nodes)
+ */
+int replace_bad(    Client_data *   list, 
+                    uint32_t        length,  
+                    uint8_t *       client_id,   
+                    IP_Port         ip_port )
 {
     uint32_t i;
-    int64_t temp_time = unix_time();
-    for(i = 0; i < length; ++i)
-        if(list[i].timestamp + BAD_NODE_TIMEOUT < temp_time) { /* if node is bad. */
+    uint64_t temp_time = unix_time();
+    for(i = 0; i < length; ++i) {
+        /* if node is bad */
+        if(list[i].timestamp + BAD_NODE_TIMEOUT < temp_time) {
             memcpy(list[i].client_id, client_id, CLIENT_ID_SIZE);
             list[i].ip_port = ip_port;
             list[i].timestamp = temp_time;
@@ -241,15 +297,20 @@ int replace_bad(Client_data * list, uint32_t length, uint8_t * client_id, IP_Por
             list[i].ret_timestamp = 0;
             return 0;
         }
+    }
 
     return 1;
 }
 
 /* replace the first good node that is further to the comp_client_id than that of the client_id in the list */
-int replace_good(Client_data * list, uint32_t length, uint8_t * client_id, IP_Port ip_port, uint8_t * comp_client_id)
+int replace_good(   Client_data *   list,
+                    uint32_t        length, 
+                    uint8_t *       client_id, 
+                    IP_Port         ip_port, 
+                    uint8_t *       comp_client_id )
 {
     uint32_t i;
-    int64_t temp_time = unix_time();
+    uint64_t temp_time = unix_time();
 
     for(i = 0; i < length; ++i)
         if(id_closest(comp_client_id, list[i].client_id, client_id) == 2) {
@@ -265,72 +326,111 @@ int replace_good(Client_data * list, uint32_t length, uint8_t * client_id, IP_Po
     return 1;
 }
 
-/* Attempt to add client with ip_port and client_id to the friends client list and close_clientlist */
+/* Attempt to add client with ip_port and client_id to the friends client list 
+ * and close_clientlist 
+ */
 void addto_lists(IP_Port ip_port, uint8_t * client_id)
 {
     uint32_t i;
 
-    /* NOTE: current behavior if there are two clients with the same id is to replace the first ip by the second. */
-    if(!client_in_list(close_clientlist, LCLIENT_LIST, client_id, ip_port))
-        if(replace_bad(close_clientlist, LCLIENT_LIST, client_id, ip_port))
+    /* NOTE: current behavior if there are two clients with the same id is
+     * to replace the first ip by the second. 
+     */
+    if (!client_in_list(close_clientlist, LCLIENT_LIST, client_id, ip_port)) {
+        if (replace_bad(close_clientlist, LCLIENT_LIST, client_id, ip_port)) {
             /* if we can't replace bad nodes we try replacing good ones */
-            replace_good(close_clientlist, LCLIENT_LIST, client_id, ip_port, self_public_key);
+            replace_good(   close_clientlist, 
+                            LCLIENT_LIST, 
+                            client_id, 
+                            ip_port, 
+                            self_public_key );
+        }
+    }
+
+    for (i = 0; i < num_friends; ++i) {
+        if (!client_in_list(    friends_list[i].client_list, 
+                                MAX_FRIEND_CLIENTS, 
+                                client_id, 
+                                ip_port )) {
 
-    for(i = 0; i < num_friends; ++i)
-        if(!client_in_list(friends_list[i].client_list, MAX_FRIEND_CLIENTS, client_id, ip_port))
-            if(replace_bad(friends_list[i].client_list, MAX_FRIEND_CLIENTS, client_id, ip_port))
+            if (replace_bad(    friends_list[i].client_list, 
+                                MAX_FRIEND_CLIENTS,
+                                client_id, 
+                                ip_port )) {
                 /* if we can't replace bad nodes we try replacing good ones. */
-                replace_good(friends_list[i].client_list, MAX_FRIEND_CLIENTS, client_id, ip_port, friends_list[i].client_id);
+                replace_good(   friends_list[i].client_list, 
+                                MAX_FRIEND_CLIENTS, 
+                                client_id, 
+                                ip_port, 
+                                friends_list[i].client_id );
+            }
+        }
+    }
 }
 
 /* If client_id is a friend or us, update ret_ip_port
-   nodeclient_id is the id of the node that sent us this info */
+ * nodeclient_id is the id of the node that sent us this info
+ */
 void returnedip_ports(IP_Port ip_port, uint8_t * client_id, uint8_t * nodeclient_id)
 {
     uint32_t i, j;
-    int64_t temp_time = unix_time();
-    if(memcmp(client_id, self_public_key, CLIENT_ID_SIZE) == 0) {
-        for(i = 0; i < LCLIENT_LIST; ++i)
-            if(memcmp(nodeclient_id, close_clientlist[i].client_id, CLIENT_ID_SIZE) == 0) {
+    uint64_t temp_time = unix_time();
+
+    if (memcmp(client_id, self_public_key, CLIENT_ID_SIZE) == 0) {
+        for (i = 0; i < LCLIENT_LIST; ++i) {
+
+            if (memcmp( nodeclient_id, 
+                        close_clientlist[i].client_id, 
+                        CLIENT_ID_SIZE ) == 0) {
                 close_clientlist[i].ret_ip_port = ip_port;
                 close_clientlist[i].ret_timestamp = temp_time;
                 return;
             }
-    } else
-        for(i = 0; i < num_friends; ++i)
-            if(memcmp(client_id, friends_list[i].client_id, CLIENT_ID_SIZE) == 0)
-                for(j = 0; j < MAX_FRIEND_CLIENTS; ++j)
-                    if(memcmp(nodeclient_id, friends_list[i].client_list[j].client_id, CLIENT_ID_SIZE) == 0) {
+        }
+    } else {
+        for (i = 0; i < num_friends; ++i) {
+            if (memcmp( client_id, 
+                        friends_list[i].client_id, 
+                        CLIENT_ID_SIZE ) == 0) {
+                for (j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
+
+                    if (memcmp( nodeclient_id, 
+                                friends_list[i].client_list[j].client_id, 
+                                CLIENT_ID_SIZE ) == 0) {
                         friends_list[i].client_list[j].ret_ip_port = ip_port;
                         friends_list[i].client_list[j].ret_timestamp = temp_time;
                         return;
                     }
+                }
+            }
+        }
+    }
 }
 
-/* check if we are currently pinging an ip_port and/or a ping_id
-   variables with values of zero will not be checked.
-   if we are already, return 1
-   else return 0
-TODO: optimize this */
+/* check if we are currently pinging an ip_port and/or a ping_id variables with
+ * values of zero will not be checked. If we are already, return 1 else return 0
+ *
+ * TODO: optimize this 
+ */
 int is_pinging(IP_Port ip_port, uint64_t ping_id)
 {
     uint32_t i;
     uint8_t pinging;
-    int64_t temp_time = unix_time();
+    uint64_t temp_time = unix_time();
 
-    for(i = 0; i < LPING_ARRAY; ++i )
-        if((pings[i].timestamp + PING_TIMEOUT) > temp_time) {
+    for (i = 0; i < LPING_ARRAY; ++i ) {
+        if ((pings[i].timestamp + PING_TIMEOUT) > temp_time) {
             pinging = 0;
-            if(ip_port.ip.i != 0)
-                if(pings[i].ip_port.ip.i == ip_port.ip.i &&
-                   pings[i].ip_port.port == ip_port.port)
-                    ++pinging;
-            if(ping_id != 0)
-                if(pings[i].ping_id == ping_id)
+            if (ip_port.ip.i != 0 &&
+                pings[i].ip_port.ip.i == ip_port.ip.i &&
+                pings[i].ip_port.port == ip_port.port)
                     ++pinging;
-            if(pinging == (ping_id != 0) + (ip_port.ip.i != 0))
+            if (ping_id != 0 && pings[i].ping_id == ping_id)
+                ++pinging;
+            if (pinging == ((ping_id != 0) + (ip_port.ip.i != 0)))
                 return 1;
         }
+    }
 
     return 0;
 }
@@ -340,44 +440,48 @@ int is_gettingnodes(IP_Port ip_port, uint64_t ping_id)
 {
     uint32_t i;
     uint8_t pinging;
-    int64_t temp_time = unix_time();
+    uint64_t temp_time = unix_time();
 
-    for(i = 0; i < LSEND_NODES_ARRAY; ++i )
+    for(i = 0; i < LSEND_NODES_ARRAY; ++i ) {
         if((send_nodes[i].timestamp + PING_TIMEOUT) > temp_time) {
             pinging = 0;
-            if(ip_port.ip.i != 0)
-                if(send_nodes[i].ip_port.ip.i == ip_port.ip.i &&
-                   send_nodes[i].ip_port.port == ip_port.port)
+            if(ip_port.ip.i != 0 &&
+                send_nodes[i].ip_port.ip.i == ip_port.ip.i &&
+                send_nodes[i].ip_port.port == ip_port.port)
                     ++pinging;
-            if(ping_id != 0)
-                if(send_nodes[i].ping_id == ping_id)
+            if(ping_id != 0 && send_nodes[i].ping_id == ping_id)
                     ++pinging;
             if(pinging == (ping_id != 0) + (ip_port.ip.i != 0))
                 return 1;
-
         }
+    }
 
     return 0;
 }
 
 /* Add a new ping request to the list of ping requests
-   returns the ping_id to put in the ping request
-   returns 0 if problem.
-   TODO: optimize this */
+ * returns the ping_id to put in the ping request
+ * returns 0 if problem.
+ *
+ * TODO: optimize this
+ */
 uint64_t add_pinging(IP_Port ip_port)
 {
     uint32_t i, j;
     uint64_t ping_id = ((uint64_t)random_int() << 32) + random_int();
-    int64_t temp_time = unix_time();
+    uint64_t temp_time = unix_time();
 
-    for(i = 0; i < PING_TIMEOUT; ++i )
-        for(j = 0; j < LPING_ARRAY; ++j )
+
+    for(i = 0; i < PING_TIMEOUT; ++i ) {
+        for(j = 0; j < LPING_ARRAY; ++j ) {
             if((pings[j].timestamp + PING_TIMEOUT - i) < temp_time) {
                 pings[j].timestamp = temp_time;
                 pings[j].ip_port = ip_port;
                 pings[j].ping_id = ping_id;
                 return ping_id;
             }
+        }
+    }
 
     return 0;
 }
@@ -387,28 +491,30 @@ uint64_t add_gettingnodes(IP_Port ip_port)
 {
     uint32_t i, j;
     uint64_t ping_id = ((uint64_t)random_int() << 32) + random_int();
-    int64_t temp_time = unix_time();
+    uint64_t temp_time = unix_time();
 
-    for(i = 0; i < PING_TIMEOUT; ++i )
-        for(j = 0; j < LSEND_NODES_ARRAY; ++j )
+    for(i = 0; i < PING_TIMEOUT; ++i ) {
+        for(j = 0; j < LSEND_NODES_ARRAY; ++j ) {
             if((send_nodes[j].timestamp + PING_TIMEOUT - i) < temp_time) {
                 send_nodes[j].timestamp = temp_time;
                 send_nodes[j].ip_port = ip_port;
                 send_nodes[j].ping_id = ping_id;
                 return ping_id;
             }
+        }
+    }
 
     return 0;
 }
 
-/* send a ping request
-   Ping request only works if none has been sent to that ip/port in the last 5 seconds. */
+/* send a ping request, only works if none has been sent to that ip/port
+ * in the last 5 seconds. 
+ */
 static int pingreq(IP_Port ip_port, uint8_t * public_key)
-{
-    if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0) /* check if packet is gonna be sent to ourself */
-        return 1;
-
-    if(is_pinging(ip_port, 0))
+{ 
+    /* check if packet is gonna be sent to ourself */
+    if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0
+        || is_pinging(ip_port, 0))
         return 1;
 
     uint64_t ping_id = add_pinging(ip_port);
@@ -420,9 +526,16 @@ static int pingreq(IP_Port ip_port, uint8_t * public_key)
     uint8_t nonce[crypto_box_NONCEBYTES];
     random_nonce(nonce);
 
-    int len = encrypt_data(public_key, self_secret_key, nonce, (uint8_t *)&ping_id, sizeof(ping_id), encrypt);
+    int len = encrypt_data( public_key, 
+                            self_secret_key, 
+                            nonce, 
+                            (uint8_t *)&ping_id, 
+                            sizeof(ping_id), 
+                            encrypt );
+
     if(len != sizeof(ping_id) + ENCRYPTION_PADDING)
         return -1;
+
     data[0] = 0;
     memcpy(data + 1, self_public_key, CLIENT_ID_SIZE);
     memcpy(data + 1 + CLIENT_ID_SIZE, nonce, crypto_box_NONCEBYTES);
@@ -443,9 +556,15 @@ static int pingres(IP_Port ip_port, uint8_t * public_key, uint64_t ping_id)
     uint8_t nonce[crypto_box_NONCEBYTES];
     random_nonce(nonce);
 
-    int len = encrypt_data(public_key, self_secret_key, nonce, (uint8_t *)&ping_id, sizeof(ping_id), encrypt);
+    int len = encrypt_data( public_key, 
+                            self_secret_key, nonce, 
+                            (uint8_t *)&ping_id, 
+                            sizeof(ping_id), 
+                            encrypt );
+
     if(len != sizeof(ping_id) + ENCRYPTION_PADDING)
         return -1;
+
     data[0] = 1;
     memcpy(data + 1, self_public_key, CLIENT_ID_SIZE);
     memcpy(data + 1 + CLIENT_ID_SIZE, nonce, crypto_box_NONCEBYTES);
@@ -458,10 +577,8 @@ static int pingres(IP_Port ip_port, uint8_t * public_key, uint64_t ping_id)
 static int getnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id)
 {
     /* check if packet is gonna be sent to ourself */
-    if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0)
-        return 1;
-
-    if(is_gettingnodes(ip_port, 0))
+    if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0
+            || is_gettingnodes(ip_port, 0))
         return 1;
 
     uint64_t ping_id = add_gettingnodes(ip_port);
@@ -478,21 +595,29 @@ static int getnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id)
     memcpy(plain, &ping_id, sizeof(ping_id));
     memcpy(plain + sizeof(ping_id), client_id, CLIENT_ID_SIZE);
 
-    int len = encrypt_data(public_key, self_secret_key, nonce, plain, sizeof(ping_id) + CLIENT_ID_SIZE, encrypt);
+    int len = encrypt_data( public_key, 
+                            self_secret_key, 
+                            nonce, 
+                            plain, 
+                            sizeof(ping_id) + CLIENT_ID_SIZE, 
+                            encrypt );
 
     if(len != sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING)
         return -1;
+
     data[0] = 2;
     memcpy(data + 1, self_public_key, CLIENT_ID_SIZE);
     memcpy(data + 1 + CLIENT_ID_SIZE, nonce, crypto_box_NONCEBYTES);
     memcpy(data + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES, encrypt, len);
+
     return sendpacket(ip_port, data, sizeof(data));
 }
 
 /* send a send nodes response */
 static int sendnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id, uint64_t ping_id)
 {
-    if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0) /* check if packet is gonna be sent to ourself */
+    /* check if packet is gonna be sent to ourself */
+    if(memcmp(public_key, self_public_key, CLIENT_ID_SIZE) == 0) 
         return 1;
 
     uint8_t data[1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id)
@@ -512,8 +637,12 @@ static int sendnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id,
     memcpy(plain, &ping_id, sizeof(ping_id));
     memcpy(plain + sizeof(ping_id), nodes_list, num_nodes * sizeof(Node_format));
 
-    int len = encrypt_data(public_key, self_secret_key, nonce, plain,
-                           sizeof(ping_id) + num_nodes * sizeof(Node_format), encrypt);
+    int len = encrypt_data( public_key, 
+                            self_secret_key, 
+                            nonce, 
+                            plain,
+                            sizeof(ping_id) + num_nodes * sizeof(Node_format), 
+                            encrypt );
 
     if(len != sizeof(ping_id) + num_nodes * sizeof(Node_format) + ENCRYPTION_PADDING)
         return -1;
@@ -526,26 +655,30 @@ static int sendnodes(IP_Port ip_port, uint8_t * public_key, uint8_t * client_id,
     return sendpacket(ip_port, data, 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + len);
 }
 
-/* Packet handling functions
-   One to handle each types of packets we receive
-   return 0 if handled correctly, 1 if packet is bad. */
+/* Packet handling functions, one to handle each types of packets we receive
+ * Returns 0 if handled correctly, 1 if packet is bad.
+ */
 int handle_pingreq(uint8_t * packet, uint32_t length, IP_Port source)
 {
     uint64_t ping_id;
     if(length != 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + ENCRYPTION_PADDING)
         return 1;
+
     /* check if packet is from ourself. */
     if(memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0)
         return 1;
 
-    int len = decrypt_data(packet + 1, self_secret_key, packet + 1 + CLIENT_ID_SIZE,
-                           packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES,
-                           sizeof(ping_id) + ENCRYPTION_PADDING, (uint8_t *)&ping_id);
+    int len = decrypt_data( packet + 1, 
+                            self_secret_key, 
+                            packet + 1 + CLIENT_ID_SIZE,
+                            packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES,
+                            sizeof(ping_id) + ENCRYPTION_PADDING, 
+                            (uint8_t *)&ping_id );
+
     if(len != sizeof(ping_id))
         return 1;
 
     pingres(source, packet + 1, ping_id);
-
     pingreq(source, packet + 1); /* TODO: make this smarter? */
 
     return 0;
@@ -556,12 +689,18 @@ int handle_pingres(uint8_t * packet, uint32_t length, IP_Port source)
     uint64_t ping_id;
     if(length != 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + ENCRYPTION_PADDING)
         return 1;
-    if(memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0) /* check if packet is from ourself. */
+
+    /* check if packet is from ourself. */
+    if(memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0)
         return 1;
 
-    int len = decrypt_data(packet + 1, self_secret_key, packet + 1 + CLIENT_ID_SIZE,
-                           packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES,
-                           sizeof(ping_id) + ENCRYPTION_PADDING, (uint8_t *)&ping_id);
+    int len = decrypt_data( packet + 1, 
+                            self_secret_key, 
+                            packet + 1 + CLIENT_ID_SIZE,
+                            packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES,
+                            sizeof(ping_id) + ENCRYPTION_PADDING, 
+                            (uint8_t *)&ping_id );
+
     if(len != sizeof(ping_id))
         return 1;
 
@@ -570,25 +709,30 @@ int handle_pingres(uint8_t * packet, uint32_t length, IP_Port source)
         return 0;
     }
     return 1;
-
 }
 
 int handle_getnodes(uint8_t * packet, uint32_t length, IP_Port source)
 {
     uint64_t ping_id;
-    if(length != 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING)
+
+    if (length != ( 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES 
+                    + sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING ))
         return 1;
+
     /* check if packet is from ourself. */
-    if(memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0)
+    if (memcmp(packet + 1, self_public_key, CLIENT_ID_SIZE) == 0)
         return 1;
 
     uint8_t plain[sizeof(ping_id) + CLIENT_ID_SIZE];
 
-    int len = decrypt_data(packet + 1, self_secret_key, packet + 1 + CLIENT_ID_SIZE,
-                           packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES,
-                           sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING, plain);
+    int len = decrypt_data( packet + 1, 
+                            self_secret_key, 
+                            packet + 1 + CLIENT_ID_SIZE,
+                            packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES,
+                            sizeof(ping_id) + CLIENT_ID_SIZE + ENCRYPTION_PADDING, 
+                            plain );
 
-    if(len != sizeof(ping_id) + CLIENT_ID_SIZE)
+    if (len != sizeof(ping_id) + CLIENT_ID_SIZE)
         return 1;
 
     memcpy(&ping_id, plain, sizeof(ping_id));
@@ -597,29 +741,28 @@ int handle_getnodes(uint8_t * packet, uint32_t length, IP_Port source)
     pingreq(source, packet + 1); /* TODO: make this smarter? */
 
     return 0;
-
 }
 
 int handle_sendnodes(uint8_t * packet, uint32_t length, IP_Port source)
 {
     uint64_t ping_id;
-    /* TODO: make this more readable */
-    if(length > (1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id)
-                 + sizeof(Node_format) * MAX_SENT_NODES + ENCRYPTION_PADDING) ||
-       (length - (1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id)
-                  + ENCRYPTION_PADDING)) % (sizeof(Node_format)) != 0 ||
-       length < 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES + sizeof(ping_id)
-       + sizeof(Node_format) + ENCRYPTION_PADDING) {
+    uint32_t cid_size = 1 + CLIENT_ID_SIZE;
+    cid_size += crypto_box_NONCEBYTES + sizeof(ping_id) + ENCRYPTION_PADDING;
+
+    if (length > (cid_size + sizeof(Node_format) * MAX_SENT_NODES) ||
+        ((length - cid_size) % sizeof(Node_format)) != 0 ||
+        (length < cid_size + sizeof(Node_format)))
         return 1;
-    }
-    uint32_t num_nodes = (length - (1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES
-                                    + sizeof(ping_id) + ENCRYPTION_PADDING)) / sizeof(Node_format);
 
+    uint32_t num_nodes = (length - cid_size) / sizeof(Node_format);
     uint8_t plain[sizeof(ping_id) + sizeof(Node_format) * MAX_SENT_NODES];
 
-    int len = decrypt_data(packet + 1, self_secret_key, packet + 1 + CLIENT_ID_SIZE,
-                           packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES,
-                           sizeof(ping_id) + num_nodes * sizeof(Node_format) + ENCRYPTION_PADDING, plain);
+    int len = decrypt_data( 
+            packet + 1, 
+            self_secret_key, 
+            packet + 1 + CLIENT_ID_SIZE,
+            packet + 1 + CLIENT_ID_SIZE + crypto_box_NONCEBYTES,
+            sizeof(ping_id) + num_nodes * sizeof(Node_format) + ENCRYPTION_PADDING, plain );
 
     if(len != sizeof(ping_id) + num_nodes * sizeof(Node_format))
         return 1;
@@ -649,12 +792,13 @@ int DHT_addfriend(uint8_t * client_id)
 {
     Friend * temp;
     temp = realloc(friends_list, sizeof(Friend) * (num_friends + 1));
-    if(temp == NULL)
+    if (temp == NULL)
         return 1;
 
     friends_list = temp;
     memset(&friends_list[num_friends], 0, sizeof(Friend));
     memcpy(friends_list[num_friends].client_id, client_id, CLIENT_ID_SIZE);
+
     friends_list[num_friends].NATping_id = ((uint64_t)random_int() << 32) + random_int();
     ++num_friends;
     return 0;
@@ -664,17 +808,21 @@ int DHT_delfriend(uint8_t * client_id)
 {
     uint32_t i;
     Friend * temp;
-    for(i = 0; i < num_friends; ++i)
+    for (i = 0; i < num_friends; ++i) {
         /* Equal */
-        if(memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) {
+        if (memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) {
             --num_friends;
-            if(num_friends != i)
-                memcpy(friends_list[i].client_id, friends_list[num_friends].client_id, CLIENT_ID_SIZE);
+            if (num_friends != i) {
+                memcpy( friends_list[i].client_id, 
+                        friends_list[num_friends].client_id, 
+                        CLIENT_ID_SIZE );
+            }
             temp = realloc(friends_list, sizeof(Friend) * (num_friends));
-            if(temp != NULL)
+            if (temp != NULL)
                 friends_list = temp;
             return 0;
         }
+    }
 
     return 1;
 }
@@ -683,86 +831,97 @@ int DHT_delfriend(uint8_t * client_id)
 IP_Port DHT_getfriendip(uint8_t * client_id)
 {
     uint32_t i, j;
+    uint64_t temp_time = unix_time();
     IP_Port empty = {{{0}}, 0};
-    int64_t temp_time = unix_time();
-    for(i = 0; i < num_friends; ++i)
+
+    for (i = 0; i < num_friends; ++i) {
         /* Equal */
-        if(memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) {
-            for(j = 0; j < MAX_FRIEND_CLIENTS; ++j)
-                if(memcmp(friends_list[i].client_list[j].client_id, client_id, CLIENT_ID_SIZE) == 0 &&
+        if (memcmp(friends_list[i].client_id, client_id, CLIENT_ID_SIZE) == 0) {
+            for (j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
+                if (memcmp( friends_list[i].client_list[j].client_id, 
+                            client_id, 
+                            CLIENT_ID_SIZE ) == 0 &&
                    friends_list[i].client_list[j].timestamp + BAD_NODE_TIMEOUT > temp_time)
                     return friends_list[i].client_list[j].ip_port;
-
+            }
             return empty;
         }
+    }
     empty.ip.i = 1;
     return empty;
-
 }
 
-/* Ping each client in the "friends" list every 60 seconds.
-   Send a get nodes request every 20 seconds to a random good node for each "friend" in our "friends" list. */
+/* Ping each client in the "friends" list every 60 seconds. Send a get nodes request
+ * every 20 seconds to a random good node for each "friend" in our "friends" list. 
+ */
 void doDHTFriends()
 {
     uint32_t i, j;
-    int64_t temp_time = unix_time();
+    uint64_t temp_time = unix_time();
     uint32_t rand_node;
     uint32_t index[MAX_FRIEND_CLIENTS];
 
-    for(i = 0; i < num_friends; ++i) {
+    for (i = 0; i < num_friends; ++i) {
         uint32_t num_nodes = 0;
-        for(j = 0; j < MAX_FRIEND_CLIENTS; ++j)
-            if(friends_list[i].client_list[j].timestamp + Kill_NODE_TIMEOUT > temp_time) { /* if node is not dead. */
-                if((friends_list[i].client_list[j].last_pinged + PING_INTERVAL) <= temp_time) {
-                    pingreq(friends_list[i].client_list[j].ip_port, friends_list[i].client_list[j].client_id);
+        for (j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
+            /* if node is not dead. */
+            if (friends_list[i].client_list[j].timestamp + Kill_NODE_TIMEOUT > temp_time) {
+                if ((friends_list[i].client_list[j].last_pinged + PING_INTERVAL) <= temp_time) {
+                    pingreq( friends_list[i].client_list[j].ip_port, 
+                             friends_list[i].client_list[j].client_id );
                     friends_list[i].client_list[j].last_pinged = temp_time;
                 }
-                if(friends_list[i].client_list[j].timestamp + BAD_NODE_TIMEOUT > temp_time) { /* if node is good. */
+                /* if node is good. */
+                if (friends_list[i].client_list[j].timestamp + BAD_NODE_TIMEOUT > temp_time) { 
                     index[num_nodes] = j;
                     ++num_nodes;
                 }
             }
+        }
         if(friends_list[i].lastgetnode + GET_NODE_INTERVAL <= temp_time && num_nodes != 0) {
             rand_node = rand() % num_nodes;
-            getnodes(friends_list[i].client_list[index[rand_node]].ip_port,
-                     friends_list[i].client_list[index[rand_node]].client_id,
-                     friends_list[i].client_id);
+            getnodes( friends_list[i].client_list[index[rand_node]].ip_port,
+                      friends_list[i].client_list[index[rand_node]].client_id,
+                      friends_list[i].client_id );
             friends_list[i].lastgetnode = temp_time;
         }
     }
 }
 
-static uint32_t close_lastgetnodes;
+static uint64_t close_lastgetnodes;
 
 /* Ping each client in the close nodes list every 60 seconds.
-   Send a get nodes request every 20 seconds to a random good node in the list. */
-void doClose() /* tested */
+ * Send a get nodes request every 20 seconds to a random good node in the list.
+ */
+void doClose()
 {
     uint32_t i;
-    int64_t temp_time = unix_time();
+    uint64_t temp_time = unix_time();
     uint32_t num_nodes = 0;
     uint32_t rand_node;
     uint32_t index[LCLIENT_LIST];
 
-    for(i = 0; i < LCLIENT_LIST; ++i)
+    for (i = 0; i < LCLIENT_LIST; ++i) {
         /* if node is not dead. */
-        if(close_clientlist[i].timestamp + Kill_NODE_TIMEOUT > temp_time) {
-            if((close_clientlist[i].last_pinged + PING_INTERVAL) <= temp_time) {
-                pingreq(close_clientlist[i].ip_port, close_clientlist[i].client_id);
+        if (close_clientlist[i].timestamp + Kill_NODE_TIMEOUT > temp_time) {
+            if ((close_clientlist[i].last_pinged + PING_INTERVAL) <= temp_time) {
+                pingreq( close_clientlist[i].ip_port, 
+                         close_clientlist[i].client_id );
                 close_clientlist[i].last_pinged = temp_time;
             }
             /* if node is good. */
-            if(close_clientlist[i].timestamp + BAD_NODE_TIMEOUT > temp_time) {
+            if (close_clientlist[i].timestamp + BAD_NODE_TIMEOUT > temp_time) {
                 index[num_nodes] = i;
                 ++num_nodes;
             }
         }
+    }
 
-    if(close_lastgetnodes + GET_NODE_INTERVAL <= temp_time && num_nodes != 0) {
+    if (close_lastgetnodes + GET_NODE_INTERVAL <= temp_time && num_nodes != 0) {
         rand_node = rand() % num_nodes;
-        getnodes(close_clientlist[index[rand_node]].ip_port,
-                 close_clientlist[index[rand_node]].client_id,
-                 self_public_key);
+        getnodes( close_clientlist[index[rand_node]].ip_port,
+                  close_clientlist[index[rand_node]].client_id,
+                  self_public_key );
         close_lastgetnodes = temp_time;
     }
 }
@@ -773,100 +932,129 @@ void DHT_bootstrap(IP_Port ip_port, uint8_t * public_key)
 }
 
 /* send the given packet to node with client_id
-   returns -1 if failure */
+ * returns -1 if failure 
+ */
 int route_packet(uint8_t * client_id, uint8_t * packet, uint32_t length)
 {
     uint32_t i;
-    for(i = 0; i < LCLIENT_LIST; ++i)
-        if(memcmp(client_id, close_clientlist[i].client_id, CLIENT_ID_SIZE) == 0)
+    for (i = 0; i < LCLIENT_LIST; ++i) {
+        if (memcmp(client_id, close_clientlist[i].client_id, CLIENT_ID_SIZE) == 0)
             return sendpacket(close_clientlist[i].ip_port, packet, length);
+    }
     return -1;
 }
 
 /* Puts all the different ips returned by the nodes for a friend_num into array ip_portlist
-   ip_portlist must be at least MAX_FRIEND_CLIENTS big
-   returns the number of ips returned
-   return 0 if we are connected to friend or if no ips were found.
-   returns -1 if no such friend*/
+ * ip_portlist must be at least MAX_FRIEND_CLIENTS big
+ * returns the number of ips returned
+ * return 0 if we are connected to friend or if no ips were found.
+ * returns -1 if no such friend
+ */
 static int friend_iplist(IP_Port * ip_portlist, uint16_t friend_num)
 {
     int num_ips = 0;
     uint32_t i;
-    int64_t temp_time = unix_time();
-    if(friend_num >= num_friends)
+    uint64_t temp_time = unix_time();
+    
+    if (friend_num >= num_friends)
         return -1;
-    for(i = 0; i < MAX_FRIEND_CLIENTS; ++i)
+
+    Friend * friend = &friends_list[friend_num];
+    Client_data * client;
+
+    for (i = 0; i < MAX_FRIEND_CLIENTS; ++i) {
+        client = &friend->client_list[i];
+
         /*If ip is not zero and node is good */
-        if(friends_list[friend_num].client_list[i].ret_ip_port.ip.i != 0 &&
-           friends_list[friend_num].client_list[i].ret_timestamp + BAD_NODE_TIMEOUT > temp_time) {
-            if(memcmp(friends_list[friend_num].client_list[i].client_id, friends_list[friend_num].client_id, CLIENT_ID_SIZE) == 0 )
+        if (client->ret_ip_port.ip.i != 0 &&
+           client->ret_timestamp + BAD_NODE_TIMEOUT > temp_time) {
+
+            if (memcmp(client->client_id, friend->client_id, CLIENT_ID_SIZE) == 0)
                 return 0;
-            ip_portlist[num_ips] = friends_list[friend_num].client_list[i].ret_ip_port;
+
+            ip_portlist[num_ips] = client->ret_ip_port;
             ++num_ips;
         }
+    }
     return num_ips;
 }
 
 /* Send the following packet to everyone who tells us they are connected to friend_id
-   returns the number of nodes it sent the packet to */
+ * returns the number of nodes it sent the packet to
+ */
 int route_tofriend(uint8_t * friend_id, uint8_t * packet, uint32_t length)
 {
-    uint32_t i, j;
-    uint32_t sent = 0;
-    int64_t temp_time = unix_time();
-    for(i = 0; i < num_friends; ++i)
-        /* Equal */
-        if(memcmp(friends_list[i].client_id, friend_id, CLIENT_ID_SIZE) == 0)  {
-            for(j = 0; j < MAX_FRIEND_CLIENTS; ++j)
-                /*If ip is not zero and node is good */
-                if(friends_list[i].client_list[j].ret_ip_port.ip.i != 0 &&
-                   friends_list[i].client_list[j].ret_timestamp + BAD_NODE_TIMEOUT > temp_time)
-                    if(sendpacket(friends_list[i].client_list[j].ip_port, packet, length) == length)
-                        ++sent;
-            return sent;
+    int num = friend_number(friend_id);
+    if (num == -1)
+        return 0;
+
+    uint32_t i, sent = 0;
+    uint64_t temp_time = unix_time();
+    Friend * friend = &friends_list[num];
+    Client_data * client;
+
+    for (i = 0; i < MAX_FRIEND_CLIENTS; ++i) {
+        client = &friend->client_list[i];
+
+        /*If ip is not zero and node is good */
+        if (client->ret_ip_port.ip.i != 0 &&
+           client->ret_timestamp + BAD_NODE_TIMEOUT > temp_time) {
+
+            if (sendpacket(client->ip_port, packet, length) == length)
+                ++sent;
         }
-    return 0;
+    }
+    return sent;
 }
 
 /* Send the following packet to one random person who tells us they are connected to friend_id
-   returns the number of nodes it sent the packet to */
+*  returns the number of nodes it sent the packet to
+*/
 int routeone_tofriend(uint8_t * friend_id, uint8_t * packet, uint32_t length)
 {
     int num = friend_number(friend_id);
-    if(num == -1)
+    if (num == -1)
         return 0;
 
+    Friend * friend = &friends_list[num];
+    Client_data * client;
+
     IP_Port ip_list[MAX_FRIEND_CLIENTS];
     int n = 0;
     uint32_t i;
-    int64_t temp_time = unix_time();
-    for(i = 0; i < MAX_FRIEND_CLIENTS; ++i)
+    uint64_t temp_time = unix_time();
+
+    for (i = 0; i < MAX_FRIEND_CLIENTS; ++i) {
+        client = &friend->client_list[i];
+
         /*If ip is not zero and node is good */
-        if(friends_list[num].client_list[i].ret_ip_port.ip.i != 0 &&
-           friends_list[num].client_list[i].ret_timestamp + BAD_NODE_TIMEOUT > temp_time) {
-            ip_list[n] = friends_list[num].client_list[i].ip_port;
+        if(client->ret_ip_port.ip.i != 0 &&
+           client->ret_timestamp + BAD_NODE_TIMEOUT > temp_time) {
+            ip_list[n] = client->ip_port;
             ++n;
         }
-    if(n < 1)
+    }
+    if (n < 1)
         return 0;
-    if(sendpacket(ip_list[rand() % n], packet, length) == length)
+    if (sendpacket(ip_list[rand() % n], packet, length) == length)
         return 1;
     return 0;
 }
 
 /* Puts all the different ips returned by the nodes for a friend_id into array ip_portlist
-   ip_portlist must be at least MAX_FRIEND_CLIENTS big
-   returns the number of ips returned
-   return 0 if we are connected to friend or if no ips were found.
-   returns -1 if no such friend*/
+ * ip_portlist must be at least MAX_FRIEND_CLIENTS big
+ * returns the number of ips returned
+ * return 0 if we are connected to friend or if no ips were found.
+ * returns -1 if no such friend
+ */
 int friend_ips(IP_Port * ip_portlist, uint8_t * friend_id)
 {
-
     uint32_t i;
-    for(i = 0; i < num_friends; ++i)
+    for (i = 0; i < num_friends; ++i) {
         /* Equal */
-        if(memcmp(friends_list[i].client_id, friend_id, CLIENT_ID_SIZE) == 0)
+        if (memcmp(friends_list[i].client_id, friend_id, CLIENT_ID_SIZE) == 0)
             return friend_iplist(ip_portlist, i);
+    }
     return -1;
 }
 
@@ -876,21 +1064,24 @@ int friend_ips(IP_Port * ip_portlist, uint8_t * friend_id)
 int send_NATping(uint8_t * public_key, uint64_t ping_id, uint8_t type)
 {
     uint8_t data[sizeof(uint64_t) + 1];
+    uint8_t packet[MAX_DATA_SIZE];
+
+    int num = 0;
+
     data[0] = type;
     memcpy(data + 1, &ping_id, sizeof(uint64_t));
+    /* 254 is NAT ping request packet id */
+    int len = create_request(packet, public_key, data, sizeof(uint64_t) + 1, 254);
 
-    uint8_t packet[MAX_DATA_SIZE];
-    int len = create_request(packet, public_key, data, sizeof(uint64_t) + 1, 254); /* 254 is NAT ping request packet id */
-    if(len == -1)
+    if (len == -1)
         return -1;
 
-    int num = 0;
+    if (type == 0) /*If packet is request use many people to route it*/
+        num = route_tofriend(public_key, packet, len);
+    else if (type == 1) /*If packet is response use only one person to route it*/
+        num = routeone_tofriend(public_key, packet, len);
 
-    if(type == 0)
-        num = route_tofriend(public_key, packet, len);/*If packet is request use many people to route it*/
-    else if(type == 1)
-        num = routeone_tofriend(public_key, packet, len);/*If packet is response use only one person to route it*/
-    if(num == 0)
+    if (num == 0)
         return -1;
     return num;
 }
@@ -898,45 +1089,54 @@ int send_NATping(uint8_t * public_key, uint64_t ping_id, uint8_t type)
 /* Handle a recieved ping request for */
 int handle_NATping(uint8_t * packet, uint32_t length, IP_Port source)
 {
-    if(length <= crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + 1 + ENCRYPTION_PADDING &&
-       length > MAX_DATA_SIZE + ENCRYPTION_PADDING)
+    if (length < crypto_box_PUBLICKEYBYTES * 2 + crypto_box_NONCEBYTES + ENCRYPTION_PADDING 
+            && length > MAX_DATA_SIZE + ENCRYPTION_PADDING)
         return 1;
+
     /* check if request is for us. */
-    if(memcmp(packet + 1, self_public_key, crypto_box_PUBLICKEYBYTES) == 0) {
+    if (memcmp(packet + 1, self_public_key, crypto_box_PUBLICKEYBYTES) == 0) {
         uint8_t public_key[crypto_box_PUBLICKEYBYTES];
         uint8_t data[MAX_DATA_SIZE];
+
         int len = handle_request(public_key, data, packet, length);
-        if(len != sizeof(uint64_t) + 1)
+        if (len != sizeof(uint64_t) + 1)
             return 1;
+
         uint64_t ping_id;
         memcpy(&ping_id, data + 1, sizeof(uint64_t));
 
         int friendnumber = friend_number(public_key);
-        if(friendnumber == -1)
+        if (friendnumber == -1)
             return 1;
 
-        if(data[0] == 0) {
-            send_NATping(public_key, ping_id, 1); /*1 is reply*/
-            friends_list[friendnumber].recvNATping_timestamp = unix_time();
+        Friend * friend = &friends_list[friendnumber];
+
+        if (data[0] == 0) {
+            /* 1 is reply */
+            send_NATping(public_key, ping_id, 1);
+            friend->recvNATping_timestamp = unix_time();
             return 0;
-        } else if (data[0] == 1)
-            if(friends_list[friendnumber].NATping_id == ping_id) {
-                friends_list[friendnumber].NATping_id = ((uint64_t)random_int() << 32) + random_int();
-                friends_list[friendnumber].hole_punching = 1;
+        } else if (data[0] == 1) {
+            if (friend->NATping_id == ping_id) {
+                friend->NATping_id = ((uint64_t)random_int() << 32) + random_int();
+                friend->hole_punching = 1;
                 return 0;
             }
+        }
         return 1;
     }
+
     /* if request is not for us, try routing it. */
-    else if(route_packet(packet + 1, packet, length) == length)
-        return 0;
+    route_packet(packet + 1, packet, length);
+
     return 0;
 }
 
-/*Get the most common ip in the ip_portlist
-  Only return ip if it appears in list min_num or more
-  len must not be bigger than MAX_FRIEND_CLIENTS
-  return ip of 0 if failure */
+/* Get the most common ip in the ip_portlist
+ * Only return ip if it appears in list min_num or more
+ * len must not be bigger than MAX_FRIEND_CLIENTS
+ * return ip of 0 if failure 
+ */
 static IP NAT_commonip(IP_Port * ip_portlist, uint16_t len, uint16_t min_num)
 {
     IP zero = {{0}};
@@ -945,29 +1145,34 @@ static IP NAT_commonip(IP_Port * ip_portlist, uint16_t len, uint16_t min_num)
 
     uint32_t i, j;
     uint16_t numbers[MAX_FRIEND_CLIENTS] = {0};
+
     for(i = 0; i < len; ++i) {
-        for(j = 0; j < len; ++j)
+        for(j = 0; j < len; ++j) {
             if(ip_portlist[i].ip.i == ip_portlist[j].ip.i)
                 ++numbers[i];
+        }
         if(numbers[i] >= min_num)
             return ip_portlist[i].ip;
     }
     return zero;
 }
 
-/*Return all the ports for one ip in a list
-  portlist must be at least len long
-  where len is the length of ip_portlist
-  returns the number of ports and puts the list of ports in portlist*/
+/* Return all the ports for one ip in a list
+ * portlist must be at least len long
+ * where len is the length of ip_portlist
+ * returns the number of ports and puts the list of ports in portlist
+ */
 static uint16_t NAT_getports(uint16_t * portlist, IP_Port * ip_portlist, uint16_t len, IP ip)
 {
     uint32_t i;
     uint16_t num = 0;
-    for(i = 0; i < len; ++i)
+
+    for(i = 0; i < len; ++i) {
         if(ip_portlist[i].ip.i == ip.i) {
             portlist[num] = ntohs(ip_portlist[i].port);
             ++num;
         }
+    }
     return num;
 }
 
@@ -975,8 +1180,10 @@ static void punch_holes(IP ip, uint16_t * port_list, uint16_t numports, uint16_t
 {
     if(numports > MAX_FRIEND_CLIENTS || numports == 0)
         return;
+
     uint32_t i;
     uint32_t top = friends_list[friend_num].punching_index + MAX_PUNCHING_PORTS;
+
     for(i = friends_list[friend_num].punching_index; i != top; i++) {
         /*TODO: improve port guessing algorithm*/
         uint16_t port = port_list[(i/2) % numports] + (i/(2*numports))*((i % 2) ? -1 : 1);
@@ -989,24 +1196,26 @@ static void punch_holes(IP ip, uint16_t * port_list, uint16_t numports, uint16_t
 static void doNAT()
 {
     uint32_t i;
-    int64_t temp_time = unix_time();
-    for(i = 0; i < num_friends; ++i) {
+    uint64_t temp_time = unix_time();
+
+    for (i = 0; i < num_friends; ++i) {
         IP_Port ip_list[MAX_FRIEND_CLIENTS];
         int num = friend_iplist(ip_list, i);
-        /*If we are connected to friend or if friend is not online don't try to hole punch with him*/
-        if(num < MAX_FRIEND_CLIENTS/2)
-            continue;
 
+        /*If already connected or friend is not online don't try to hole punch*/
+        if (num < MAX_FRIEND_CLIENTS/2)
+            continue;
 
-        if(friends_list[i].NATping_timestamp + PUNCH_INTERVAL < temp_time) {
+        if (friends_list[i].NATping_timestamp + PUNCH_INTERVAL < temp_time) {
             send_NATping(friends_list[i].client_id, friends_list[i].NATping_id, 0); /*0 is request*/
             friends_list[i].NATping_timestamp = temp_time;
         }
-        if(friends_list[i].hole_punching == 1 &&
+        if (friends_list[i].hole_punching == 1 &&
             friends_list[i].punching_timestamp + PUNCH_INTERVAL < temp_time && 
             friends_list[i].recvNATping_timestamp + PUNCH_INTERVAL*2 >= temp_time) {
+
             IP ip = NAT_commonip(ip_list, num, MAX_FRIEND_CLIENTS/2);
-            if(ip.i == 0)
+            if (ip.i == 0)
                 continue;
 
             uint16_t port_list[MAX_FRIEND_CLIENTS];
@@ -1069,17 +1278,22 @@ void DHT_save(uint8_t * data)
 }
 
 /* load the DHT from data of size size;
-   return -1 if failure
-   return 0 if success */
+ * return -1 if failure
+ * return 0 if success 
+ */
 int DHT_load(uint8_t * data, uint32_t size)
 {
     if(size < sizeof(close_clientlist))
         return -1;
+
     if((size - sizeof(close_clientlist)) % sizeof(Friend) != 0)
         return -1;
+
     uint32_t i, j;
-    /* int64_t temp_time = unix_time(); */
     uint16_t temp;
+    /* uint64_t temp_time = unix_time(); */
+
+    Client_data * client;
 
     temp = (size - sizeof(close_clientlist))/sizeof(Friend);
 
@@ -1088,29 +1302,35 @@ int DHT_load(uint8_t * data, uint32_t size)
 
         for(i = 0; i < temp; ++i) {
             DHT_addfriend(tempfriends_list[i].client_id);
-            for(j = 0; j < MAX_FRIEND_CLIENTS; ++j)
-                if(tempfriends_list[i].client_list[j].timestamp != 0) {
-                    getnodes(tempfriends_list[i].client_list[j].ip_port,
-                             tempfriends_list[i].client_list[j].client_id, tempfriends_list[i].client_id);
-                }
+
+            for(j = 0; j < MAX_FRIEND_CLIENTS; ++j) {
+                client = &tempfriends_list[i].client_list[j];
+                if(client->timestamp != 0)
+                    getnodes(client->ip_port, client->client_id, tempfriends_list[i].client_id);
+            }
         }
     }
     Client_data * tempclose_clientlist = (Client_data *)data;
 
-    for(i = 0; i < LCLIENT_LIST; ++i)
+    for(i = 0; i < LCLIENT_LIST; ++i) {
         if(tempclose_clientlist[i].timestamp != 0)
-            DHT_bootstrap(tempclose_clientlist[i].ip_port, tempclose_clientlist[i].client_id);
+            DHT_bootstrap(  tempclose_clientlist[i].ip_port, 
+                            tempclose_clientlist[i].client_id );
+    }
     return 0;
 }
 
 /* returns 0 if we are not connected to the DHT
-   returns 1 if we are */
+ * returns 1 if we are 
+ */
 int DHT_isconnected()
 {
     uint32_t i;
-    int64_t temp_time = unix_time();
-    for(i = 0; i < LCLIENT_LIST; ++i)
+    uint64_t temp_time = unix_time();
+
+    for(i = 0; i < LCLIENT_LIST; ++i) {
         if(close_clientlist[i].timestamp + BAD_NODE_TIMEOUT > temp_time)
             return 1;
+    }
     return 0;
 }
diff --git a/core/DHT.h b/core/DHT.h
index 5e1fd0a5..ffa02087 100644
--- a/core/DHT.h
+++ b/core/DHT.h
@@ -31,7 +31,7 @@ extern "C" {
 #endif
 
 /* Current time, unix format */
-#define unix_time() ((int64_t)time(NULL))
+#define unix_time() ((uint64_t)time(NULL))
 
 /* size of the client_id in bytes */
 #define CLIENT_ID_SIZE crypto_box_PUBLICKEYBYTES
diff --git a/core/Lossless_UDP.c b/core/Lossless_UDP.c
index 4affc38f..33b8eb19 100644
--- a/core/Lossless_UDP.c
+++ b/core/Lossless_UDP.c
@@ -202,15 +202,16 @@ int new_connection(IP_Port ip_port)
     for (i = 0; i < MAX_CONNECTIONS; ++i) {
         if(connections[i].status == 0) {
             memset(&connections[i], 0, sizeof(Connection));
+            uint32_t handshake_id1 = handshake_id(ip_port);
 
             connections[i] = (Connection) {
               .ip_port            = ip_port,
               .status             = 1,
               .inbound            = 0,
-              .handshake_id1      = handshake_id(ip_port),
-              .sent_packetnum     = connections[i].handshake_id1,
-              .sendbuff_packetnum = connections[i].handshake_id1,
-              .successful_sent    = connections[i].handshake_id1,
+              .handshake_id1      = handshake_id1,
+              .sent_packetnum     = handshake_id1,
+              .sendbuff_packetnum = handshake_id1,
+              .successful_sent    = handshake_id1,
               .SYNC_rate          = SYNC_RATE,
               .data_rate          = DATA_SYNC_RATE,
               .last_recvSYNC      = current_time(),
@@ -254,6 +255,7 @@ int new_inconnection(IP_Port ip_port)
     for (i = 0; i < MAX_CONNECTIONS; ++i) {
         if (connections[i].status == 0) {
             memset(&connections[i], 0, sizeof(Connection));
+            uint64_t timeout = CONNEXION_TIMEOUT + rand() % CONNEXION_TIMEOUT;
 
             connections[i] = (Connection){
                 .ip_port       = ip_port,
@@ -266,10 +268,10 @@ int new_inconnection(IP_Port ip_port)
                 .send_counter  = 127,
 
                 /* add randomness to timeout to prevent connections getting stuck in a loop. */
-                .timeout       = CONNEXION_TIMEOUT + rand() % CONNEXION_TIMEOUT,
+                .timeout       = timeout,
 
                 /* if this connection isn't handled within the timeout kill it. */
-                .killat        = current_time() + 1000000UL*connections[i].timeout
+                .killat        = current_time() + 1000000UL*timeout
             };
             ++connections_number;
             return i;
diff --git a/core/Messenger.c b/core/Messenger.c
index 3ffbe6ab..c768633e 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -27,7 +27,7 @@
 typedef struct {
     uint8_t client_id[CLIENT_ID_SIZE];
     int crypt_connection_id;
-    int64_t friend_request_id; /* id of the friend request corresponding to the current friend request to the current friend. */
+    uint64_t friend_request_id; /* id of the friend request corresponding to the current friend request to the current friend. */
     uint8_t status; /* 0 if no friend, 1 if added, 2 if friend request sent, 3 if confirmed friend, 4 if online. */
     uint8_t info[MAX_DATA_SIZE]; /* the data that is sent during the friend requests we do */
     uint8_t name[MAX_NAME_LENGTH];
@@ -485,7 +485,7 @@ static void doInbound()
 /*Interval in seconds between LAN discovery packet sending*/
 #define LAN_DISCOVERY_INTERVAL 60
 
-static int64_t last_LANdiscovery;
+static uint64_t last_LANdiscovery;
 
 /*Send a LAN discovery packet every LAN_DISCOVERY_INTERVAL seconds*/
 static void LANdiscovery()
diff --git a/core/net_crypto.c b/core/net_crypto.c
index 31fb24be..3b5b67f4 100644
--- a/core/net_crypto.c
+++ b/core/net_crypto.c
@@ -66,11 +66,11 @@ static int incoming_connections[MAX_INCOMING];
 int encrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
                  uint8_t *plain, uint32_t length, uint8_t *encrypted)
 {
-    if (length - crypto_box_BOXZEROBYTES + crypto_box_ZEROBYTES > MAX_DATA_SIZE || length == 0)
+    if (length + crypto_box_MACBYTES > MAX_DATA_SIZE || length == 0)
         return -1;
 
-    uint8_t temp_plain[MAX_DATA_SIZE + crypto_box_ZEROBYTES - crypto_box_BOXZEROBYTES] = {0};
-    uint8_t temp_encrypted[MAX_DATA_SIZE + crypto_box_ZEROBYTES];
+    uint8_t temp_plain[MAX_DATA_SIZE + crypto_box_BOXZEROBYTES] = {0};
+    uint8_t temp_encrypted[MAX_DATA_SIZE + crypto_box_BOXZEROBYTES];
 
     memcpy(temp_plain + crypto_box_ZEROBYTES, plain, length); /* pad the message with 32 0 bytes. */
 
@@ -87,7 +87,7 @@ int encrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
         return -1;
 
     /* unpad the encrypted message */
-    memcpy(encrypted, temp_encrypted + crypto_box_BOXZEROBYTES, length - crypto_box_BOXZEROBYTES + crypto_box_ZEROBYTES);
+    memcpy(encrypted, temp_encrypted + crypto_box_BOXZEROBYTES, length + crypto_box_MACBYTES);
     return length - crypto_box_BOXZEROBYTES + crypto_box_ZEROBYTES;
 }
 
@@ -101,8 +101,8 @@ int decrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
     if (length > MAX_DATA_SIZE || length <= crypto_box_BOXZEROBYTES)
         return -1;
 
-    uint8_t temp_plain[MAX_DATA_SIZE - crypto_box_ZEROBYTES + crypto_box_BOXZEROBYTES];
-    uint8_t temp_encrypted[MAX_DATA_SIZE + crypto_box_ZEROBYTES] = {0};
+    uint8_t temp_plain[MAX_DATA_SIZE + crypto_box_BOXZEROBYTES];
+    uint8_t temp_encrypted[MAX_DATA_SIZE + crypto_box_BOXZEROBYTES] = {0};
 
     memcpy(temp_encrypted + crypto_box_BOXZEROBYTES, encrypted, length); /* pad the message with 16 0 bytes. */
 
@@ -121,7 +121,7 @@ int decrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
         return -1;
 
     /* unpad the plain message */
-    memcpy(plain, temp_plain + crypto_box_ZEROBYTES, length - crypto_box_ZEROBYTES + crypto_box_BOXZEROBYTES);
+    memcpy(plain, temp_plain + crypto_box_ZEROBYTES, length - crypto_box_MACBYTES);
     return length - crypto_box_ZEROBYTES + crypto_box_BOXZEROBYTES;
 }
 
diff --git a/testing/DHT_test.c b/testing/DHT_test.c
index 588450e2..f1940614 100644
--- a/testing/DHT_test.c
+++ b/testing/DHT_test.c
@@ -60,11 +60,11 @@ void print_clientlist()
         }
         p_ip = close_clientlist[i].ip_port;
         printf("\nIP: %u.%u.%u.%u Port: %u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-        printf("\nTimestamp: %u", close_clientlist[i].timestamp);
-        printf("\nLast pinged: %u\n", close_clientlist[i].last_pinged);
+        printf("\nTimestamp: %llu",(long long unsigned int) close_clientlist[i].timestamp);
+        printf("\nLast pinged: %llu\n",(long long unsigned int) close_clientlist[i].last_pinged);
         p_ip = close_clientlist[i].ret_ip_port;
         printf("OUR IP: %u.%u.%u.%u Port: %u\n",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-        printf("Timestamp: %u\n", close_clientlist[i].ret_timestamp);
+        printf("Timestamp: %llu\n",(long long unsigned int) close_clientlist[i].ret_timestamp);
     }  
 }
 
@@ -93,11 +93,11 @@ void print_friendlist()
             }
             p_ip = friends_list[k].client_list[i].ip_port;
             printf("\nIP: %u.%u.%u.%u:%u",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-            printf("\nTimestamp: %u", friends_list[k].client_list[i].timestamp);
-            printf("\nLast pinged: %u\n", friends_list[k].client_list[i].last_pinged);
+            printf("\nTimestamp: %llu",(long long unsigned int) friends_list[k].client_list[i].timestamp);
+            printf("\nLast pinged: %llu\n",(long long unsigned int) friends_list[k].client_list[i].last_pinged);
             p_ip = friends_list[k].client_list[i].ret_ip_port;
             printf("ret IP: %u.%u.%u.%u:%u\n",p_ip.ip.c[0],p_ip.ip.c[1],p_ip.ip.c[2],p_ip.ip.c[3],ntohs(p_ip.port));
-            printf("Timestamp: %u\n", friends_list[k].client_list[i].ret_timestamp);
+            printf("Timestamp: %llu\n", (long long unsigned int)friends_list[k].client_list[i].ret_timestamp);
         }
     }
 }
diff --git a/testing/nTox.c b/testing/nTox.c
index 81cac0b6..13db58d7 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -18,7 +18,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with Tox.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
 #include "nTox.h"
 #include "misc_tools.h"
@@ -44,13 +44,37 @@ int x, y;
 uint8_t pending_requests[256][CLIENT_ID_SIZE];
 uint8_t num_requests = 0;
 
+void get_id(char *data)
+{
+    char idstring0[200];
+    char idstring1[PUB_KEY_BYTES][5];
+    char idstring2[PUB_KEY_BYTES][5];
+    int i = 0;
+    for(i = 0; i < PUB_KEY_BYTES; i++)
+    {
+        if (self_public_key[i] < (PUB_KEY_BYTES / 2))
+            strcpy(idstring1[i],"0");
+        else
+            strcpy(idstring1[i], "");
+        sprintf(idstring2[i], "%hhX",self_public_key[i]);
+    }
+    strcpy(idstring0,"[i] ID: ");
+    int j = 0;
+    for (j = 0; j < PUB_KEY_BYTES; j++) {
+        strcat(idstring0,idstring1[j]);
+        strcat(idstring0,idstring2[j]);
+    }
+
+    memcpy(data, idstring0, strlen(idstring0));
+}
+
 void new_lines(char *line)
 {
-    int i;
-    for (i = HISTORY-1; i > 0; i--) 
-        strcpy(lines[i], lines[i-1]);
-    
-    strcpy(lines[0], line);
+    int i = 0;
+    for (i = HISTORY-1; i > 0; i--)
+        strncpy(lines[i], lines[i-1], STRING_LENGTH - 1);
+
+    strncpy(lines[0], line, STRING_LENGTH - 1);
     do_refresh();
 }
 
@@ -109,7 +133,7 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
         if (inpt_command == 'f') { // add friend command: /f ID
             int i;
             char temp_id[128];
-            for (i = 0; i < 128; i++) 
+            for (i = 0; i < 128; i++)
                 temp_id[i] = line[i+prompt_offset];
 
             int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
@@ -142,8 +166,8 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
         }
         else if (inpt_command == 'm') { //message command: /m friendnumber messsage
             size_t len = strlen(line);
-            if(len < 3)
-              return;
+            if(len < 3)
+                return;
 
             char numstring[len-3];
             char message[len-3];
@@ -216,32 +240,15 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
            new_lines("[i] /l list (list friends), /h for help, /i for info, /n nick (to change nickname), /q (to quit)");
         }
        else if (inpt_command == 'i') { //info
-           char idstring0[200];
-           char idstring1[PUB_KEY_BYTES][5];
-           char idstring2[PUB_KEY_BYTES][5];
-           int i;
-           for (i = 0; i < PUB_KEY_BYTES; i++)
-           {
-               if (self_public_key[i] < (PUB_KEY_BYTES/2))
-                   strcpy(idstring1[i],"0");
-               else 
-                   strcpy(idstring1[i], "");
-               sprintf(idstring2[i], "%hhX", self_public_key[i]);
-           }
-           //
-           strcpy(idstring0,"[i] ID: ");
-           int j;
-           for (j = 0; j < PUB_KEY_BYTES; j++) {
-               strcat(idstring0,idstring1[j]);
-               strcat(idstring0,idstring2[j]);
-           }    
-                  new_lines(idstring0);
+           char idstring[200];
+           get_id(idstring);
+           new_lines(idstring);
        }
 
         else if (inpt_command == 'q') { //exit
             endwin();
             exit(EXIT_SUCCESS);
-        } else { 
+        } else {
             new_lines("[i] invalid command");
         }
     } else {
@@ -328,7 +335,7 @@ void print_message(int friendnumber, uint8_t * string, uint16_t length)
     new_lines(format_message((char*)string, friendnumber));
 }
 
-void print_nickchange(int friendnumber, uint8_t *string, uint16_t length) 
+void print_nickchange(int friendnumber, uint8_t *string, uint16_t length)
 {
     char name[MAX_NAME_LENGTH];
     getname(friendnumber, (uint8_t*)name);
@@ -337,7 +344,7 @@ void print_nickchange(int friendnumber, uint8_t *string, uint16_t length)
     new_lines(msg);
 }
 
-void print_statuschange(int friendnumber, uint8_t *string, uint16_t length) 
+void print_statuschange(int friendnumber, uint8_t *string, uint16_t length)
 {
     char name[MAX_NAME_LENGTH];
     getname(friendnumber, (uint8_t*)name);
@@ -346,7 +353,7 @@ void print_statuschange(int friendnumber, uint8_t *string, uint16_t length)
     new_lines(msg);
 }
 
-void load_key() 
+void load_key()
 {
     FILE *data_file = NULL;
     data_file = fopen("data","r");
@@ -361,7 +368,7 @@ void load_key()
             exit(1);
         }
         Messenger_load(data, size);
-    } else { 
+    } else {
         //else save new keys
         int size = Messenger_size();
         uint8_t data[size];
@@ -396,29 +403,14 @@ int main(int argc, char *argv[])
     m_callback_friendmessage(print_message);
     m_callback_namechange(print_nickchange);
     m_callback_userstatus(print_statuschange);
-    char idstring0[200];
-    char idstring1[PUB_KEY_BYTES][5];
-    char idstring2[PUB_KEY_BYTES][5];
-    int i;
-    for(i = 0; i < PUB_KEY_BYTES; i++)
-    {
-        if (self_public_key[i] < (PUB_KEY_BYTES / 2))
-            strcpy(idstring1[i],"0");
-        else 
-            strcpy(idstring1[i], "");
-        sprintf(idstring2[i], "%hhX",self_public_key[i]);
-    }
-    strcpy(idstring0,"[i] your ID: ");
-    int j;
-    for (j = 0; j < PUB_KEY_BYTES; j++) {
-        strcat(idstring0,idstring1[j]);
-        strcat(idstring0,idstring2[j]);
-    }
+
+    char idstring[200];
+    get_id(idstring);
     initscr();
     noecho();
     raw();
     getmaxyx(stdscr, y, x);
-    new_lines(idstring0);
+    new_lines(idstring);
     new_lines(help);
     strcpy(line, "");
     IP_Port bootstrap_ip_port;
@@ -426,9 +418,9 @@ int main(int argc, char *argv[])
     int resolved_address = resolve_addr(argv[1]);
     if (resolved_address != 0)
         bootstrap_ip_port.ip.i = resolved_address;
-    else 
+    else
         exit(1);
-    
+
     DHT_bootstrap(bootstrap_ip_port, hex_string_to_bin(argv[3]));
     nodelay(stdscr, TRUE);
     while(true) {
@@ -449,7 +441,7 @@ int main(int argc, char *argv[])
         if (c == '\n') {
             line_eval(lines, line);
             strcpy(line, "");
-        } else if (c == 127) {
+        } else if (c == 8 || c == 127) {
             line[strlen(line)-1] = '\0';
         } else if (isalnum(c) || ispunct(c) || c == ' ') {
             strcpy(line, appender(line, (char) c));
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c
index 27fc6ff3..3b6fb043 100644
--- a/testing/nTox_win32.c
+++ b/testing/nTox_win32.c
@@ -28,6 +28,7 @@
 
 uint8_t pending_requests[256][CLIENT_ID_SIZE];
 uint8_t num_requests = 0;
+uint32_t maxnumfriends;
 
 char line[STRING_LENGTH];
 char users_id[200];
@@ -105,6 +106,7 @@ void load_key()
         int size = Messenger_size();
         uint8_t data[size];
         Messenger_save(data);
+        fclose(data_file);
         data_file = fopen("data", "w");
 
         if (fwrite(data, sizeof(uint8_t), size, data_file) != size) {
@@ -115,32 +117,178 @@ void load_key()
     fclose(data_file);
 }
 
+void add_friend()
+{
+    int i;
+    char temp_id[128];
+    
+    for (i = 0; i < 128; i++)  
+        temp_id[i] = line[i+3];
+    
+    int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
+   
+    if (num >= 0) {
+        char numstring[100];
+        sprintf(numstring, "\n[i] Friend request sent. Wait to be accepted. Friend id: %d\n\n", num);
+        printf(numstring);
+        ++maxnumfriends;
+    }
+    else if (num == -1) 
+        printf("\n[i] Message is too long.\n\n");
+    
+    else if (num == -2)
+        printf("\n[i] Please add a message to your friend request.\n\n");
+    
+    else if (num == -3)
+        printf("\n[i] That appears to be your own ID.\n\n");
+    
+    else if (num == -4)
+        printf("\n[i] Friend request already sent.\n\n");
+    
+    else if (num == -5)
+        printf("\n[i] Undefined error when adding friend\n\n");
+}
+
+void list_friends()
+{
+    int activefriends = 0;
+    int i;
+
+    for (i = 0; i <= maxnumfriends; i++) {
+        if (m_friendstatus(i) == 4)
+            activefriends++;
+    }
+
+    printf("\n[i] Friend List | Total: %d\n\n", activefriends);
+
+    for (i = 0; i <= 256; i++) {/* TODO: fix this properly*/
+        char name[MAX_NAME_LENGTH];
+        getname(i, (uint8_t*)name);
+        
+        if (m_friendstatus(i) == 4)    
+            printf("[%d] %s\n\n", i, (uint8_t*)name);
+    }
+}
+
+void delete_friend()
+{
+    size_t len = strlen(line);
+    char numstring[len-3];
+    int i;
+    
+    for (i = 0; i < len; i++) {
+        if (line[i+3] != ' ')
+            numstring[i] = line[i+3];
+    }
+    
+    int num = atoi(numstring);
+    m_delfriend(num);
+    --maxnumfriends;
+    printf("\n\n");
+}
+
+void message_friend()
+{
+    size_t len = strlen(line);
+    char numstring[len-3];
+    char message[len-3];
+    int i;
+    
+    for (i = 0; i < len; i++) {
+
+        if (line[i+3] != ' ') 
+            numstring[i] = line[i+3];
+
+        else {
+            int j;
+
+            for (j = (i+1); j < len; j++)
+                message[j-i-1] = line[j+3];
+
+            break;
+        }
+    }
+
+    int num = atoi(numstring);
+
+    if(m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1)
+        printf("\n[i] could not send message (they may be offline): %s\n", message);
+   
+    else
+        printf("\n");
+}
+
+void change_nickname()
+{
+    uint8_t name[MAX_NAME_LENGTH];
+    int i = 0;
+    size_t len = strlen(line);
+    
+    for (i = 3; i < len; i++) {
+
+        if (line[i] == 0 || line[i] == '\n') 
+            break;
+
+        name[i-3] = line[i];
+    }
+    
+    name[i-3] = 0;
+    setname(name, i);
+    char numstring[100];
+    sprintf(numstring, "\n[i] changed nick to %s\n\n", (char*)name);
+    printf(numstring);
+
+    FILE *name_file = NULL;
+    name_file = fopen("namefile.txt", "w");
+    fprintf(name_file, "%s", (char*)name);
+    fclose(name_file);
+}
+
+void change_status()
+{
+    uint8_t status[MAX_USERSTATUS_LENGTH];
+    int i = 0;
+    size_t len = strlen(line);
+    
+    for (i = 3; i < len; i++) {
+        if (line[i] == 0 || line[i] == '\n') 
+            break;
+        
+        status[i-3] = line[i];
+    }
+
+    status[i-3] = 0;
+    m_set_userstatus(status, strlen((char*)status));
+    char numstring[100];
+    sprintf(numstring, "\n[i] changed status to %s\n\n", (char*)status);
+    printf(numstring);
+
+    FILE* status_file = NULL;
+    status_file = fopen("statusfile.txt", "w");
+    fprintf(status_file, "%s", (char*)status);
+    fclose(status_file);
+}
+
+void accept_friend_request()
+{
+    uint8_t numf = atoi(line + 3);
+    char numchar[100];
+    sprintf(numchar, "\n[i] friend request %u accepted\n\n", numf);
+    printf(numchar);
+    int num = m_addfriend_norequest(pending_requests[numf]);
+    sprintf(numchar, "\n[i] added friendnumber %d\n\n", num);
+    printf(numchar);
+    ++maxnumfriends;
+}
+
 void line_eval(char* line)
 {
     if(line[0] == '/') {
+
         char inpt_command = line[1];
-        /* Add friend */
+
         if(inpt_command == 'f') {
-            int i;
-            char temp_id[128];
-            for (i = 0; i < 128; i++) 
-                temp_id[i] = line[i+3];
-            int num = m_addfriend(hex_string_to_bin(temp_id), (uint8_t*)"Install Gentoo", sizeof("Install Gentoo"));
-            if (num >= 0) {
-                char numstring[100];
-                sprintf(numstring, "\n[i] Friend request sent. Wait to be accepted. Friend id: %d\n\n", num);
-                printf(numstring);
-            }
-            else if (num == -1) 
-                printf("\n[i] Message is too long.\n\n");
-            else if (num == -2)
-                printf("\n[i] Please add a message to your friend request.\n\n");
-            else if (num == -3)
-                printf("\n[i] That appears to be your own ID.\n\n");
-            else if (num == -4)
-                printf("\n[i] Friend request already sent.\n\n");
-            else if (num == -5)
-                printf("\n[i] Undefined error when adding friend\n\n");
+            add_friend(line);
         }
 
         else if (inpt_command == 'r') {
@@ -149,96 +297,27 @@ void line_eval(char* line)
         }
 
         else if (inpt_command == 'l') {
-            int activefriends = 0;
-            int i;
+            list_friends(line);
         }
 
         else if (inpt_command == 'd') {
-            size_t len = strlen(line);
-            char numstring[len-3];
-            int i;
-            for (i = 0; i < len; i++) {
-                if (line[i+3] != ' ') {
-                    numstring[i] = line[i+3];
-                }
-            }
-            int num = atoi(numstring);
-            m_delfriend(num);
-            printf("\n\n");
+            delete_friend(line);
         }
         /* Send message to friend */
         else if (inpt_command == 'm') {
-            size_t len = strlen(line);
-            char numstring[len-3];
-            char message[len-3];
-            int i;
-            for (i = 0; i < len; i++) {
-                if (line[i+3] != ' ') {
-                    numstring[i] = line[i+3];
-                } else {
-                    int j;
-                    for (j = (i+1); j < len; j++)
-                        message[j-i-1] = line[j+3];
-                    break;
-                }
-            }
-            int num = atoi(numstring);
-            if(m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1) {
-                printf("\n[i] could not send message (they may be offline): %s\n", message);
-            } else {
-                //simply for aesthetics
-                printf("\n");
-            }
+            message_friend(line);
         }
 
         else if (inpt_command == 'n') {
-            uint8_t name[MAX_NAME_LENGTH];
-            int i = 0;
-            size_t len = strlen(line);
-            for (i = 3; i < len; i++) {
-                if (line[i] == 0 || line[i] == '\n') break;
-                name[i-3] = line[i];
-            }
-            name[i-3] = 0;
-            setname(name, i);
-            char numstring[100];
-            sprintf(numstring, "\n[i] changed nick to %s\n\n", (char*)name);
-            printf(numstring);
-
-            FILE *name_file = NULL;
-            name_file = fopen("namefile.txt", "w");
-            fprintf(name_file, "%s", (char*)name);
-            fclose(name_file);
+            change_nickname(line);
         }
 
         else if (inpt_command == 's') {
-            uint8_t status[MAX_USERSTATUS_LENGTH];
-            int i = 0;
-            size_t len = strlen(line);
-            for (i = 3; i < len; i++) {
-                if (line[i] == 0 || line[i] == '\n') break;
-                status[i-3] = line[i];
-            }
-            status[i-3] = 0;
-            m_set_userstatus(status, strlen((char*)status));
-            char numstring[100];
-            sprintf(numstring, "\n[i] changed status to %s\n\n", (char*)status);
-            printf(numstring);
-
-            FILE* status_file = NULL;
-            status_file = fopen("statusfile.txt", "w");
-            fprintf(status_file, "%s", (char*)status);
-            fclose(status_file);
+            change_status(line);
         }
 
         else if (inpt_command == 'a') {
-            uint8_t numf = atoi(line + 3);
-            char numchar[100];
-            sprintf(numchar, "\n[i] friend request %u accepted\n\n", numf);
-            printf(numchar);
-            int num = m_addfriend_norequest(pending_requests[numf]);
-            sprintf(numchar, "\n[i] added friendnumber %d\n\n", num);
-            printf(numchar);
+            accept_friend_request(line);
         }
         /* EXIT */
         else if (inpt_command == 'q') { 
@@ -246,8 +325,6 @@ void line_eval(char* line)
             m_set_userstatus(status, strlen((char*)status));
             exit(EXIT_SUCCESS);
         }
-    } else {
-        //nothing atm
     }
 }
 
@@ -290,8 +367,9 @@ int main(int argc, char *argv[])
         setname(name, strlen((char*)name)+1);
         nameloaded = 1;
         printf("%s\n", name);
+        fclose(name_file);
     }
-    fclose(name_file);
+    
 
     FILE* status_file = NULL;
     status_file = fopen("statusfile.txt", "r");
@@ -303,8 +381,9 @@ int main(int argc, char *argv[])
         m_set_userstatus(status, strlen((char*)status)+1);
         statusloaded = 1;
         printf("%s\n", status);
+        fclose(status_file);
     }
-    fclose(status_file);
+    
 
     m_callback_friendrequest(print_request);
     m_callback_friendmessage(print_message);
diff --git a/testing/nTox_win32.h b/testing/nTox_win32.h
index 374348a4..211ac95f 100644
--- a/testing/nTox_win32.h
+++ b/testing/nTox_win32.h
@@ -34,6 +34,13 @@ void print_message(int friendnumber, uint8_t * string, uint16_t length);
 void print_nickchange(int friendnumber, uint8_t *string, uint16_t length);
 void print_statuschange(int friendnumber, uint8_t *string, uint16_t length);
 void load_key();
+void add_friend();
+void list_friends();
+void delete_friend();
+void message_friend();
+void change_nickname();
+void change_status();
+void accept_friend_request();
 void line_eval(char* line);
 void get_input();
 
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 484f5906..1db60883 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -140,6 +140,7 @@ static void execute(ToxWindow* self, char* cmd) {
       break;
     case -2:
       wprintw(self->window, "Please add a message to your request.\n");
+      break;
     case -3:
       wprintw(self->window, "That appears to be your own ID.\n");
       break;