4 files changed, 17 insertions, 17 deletions

diff --git a/INSTALL.md b/INSTALL.md
index a0c4165d..87451948 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -6,7 +6,6 @@
       - [Homebrew](#homebrew)
       - [Non-Homebrew](#non-homebrew)
     - [Windows](#windows)
-- [Usage](#usage)
 
 <a name="installation" />
 ##Installation
@@ -32,11 +31,14 @@ sudo checkinstall --install --pkgname libsodium --pkgversion 0.4.2 --nodoc
 sudo ldconfig
 ```
 
-Then clone this repo and run:
+Then clone this repo and generate makefile:
 ```bash
+git clone git://github.com/irungentoo/ProjectTox-Core.git
+cd ProjectTox-Core
 mkdir build && cd build
 cmake ..
 ```
+Note that you should call cmake on the root [`CMakeLists.txt`](/CMakeLists.txt) file only.
 
 Then you can build any of the [`/testing`](/testing) and [`/other`](/other) that are currently supported on your platform by running:
 ```bash
@@ -102,6 +104,7 @@ Navigate in `cmd` to this repo and run:
 mkdir build && cd build
 cmake -G "MinGW Makefiles" ..
 ```
+Note that you should call cmake on the root [`CMakeLists.txt`](/CMakeLists.txt) file only.
 
 Then you can build any of the [`/testing`](/testing) and [`/other`](/other) that are currently supported on your platform by running:
 ```cmd
@@ -117,7 +120,3 @@ Or you could just build everything that is supported on your platform by running
 mingw32-make
 ```
 
-<a name="usage" />
-## Usage
-
-- [Start Guide](start_guide.md)
diff --git a/README.md b/README.md
index 092fe2f6..5785e9cb 100644
--- a/README.md
+++ b/README.md
@@ -41,7 +41,7 @@ For further information, check our [To-do list](https://github.com/irungentoo/Pr
 The goal of this project is to create a configuration-free P2P skype 
 replacement. Configuration-free means that the user will simply have to open the program and 
 without any account configuration will be capable of adding people to his 
-friends list and start conversing with them. There are many so called skype replacements and all of them are either hard to 
+friends list and start conversing with them. There are many so-called skype replacements and all of them are either hard to 
 configure for the normal user or suffer from being way too centralized.
 
 ### Documentation:
diff --git a/core/net_crypto.c b/core/net_crypto.c
index 83cb20a2..2dbaa87c 100644
--- a/core/net_crypto.c
+++ b/core/net_crypto.c
@@ -75,10 +75,9 @@ int encrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
     uint32_t i;
     uint32_t check = 0;
     for(i = 0; i < crypto_box_BOXZEROBYTES; ++i) {
-        if (temp_encrypted[i] != 0)
-            check = 1;
+            check |= temp_encrypted[i] ^ 0;
     }
-    if(check == 1)
+    if(check != 0)
         return -1;
 
     /* unpad the encrypted message */
@@ -110,10 +109,9 @@ int decrypt_data(uint8_t *public_key, uint8_t *secret_key, uint8_t *nonce,
     uint32_t i;
     uint32_t check = 0;
     for(i = 0; i < crypto_box_ZEROBYTES; ++i) {
-        if (temp_plain[i] != 0)
-            check = 1;
+            check |= temp_plain[i] ^ 0;
     }
-    if(check == 1)
+    if(check != 0)
         return -1;
 
     /* unpad the plain message */
diff --git a/testing/nTox.c b/testing/nTox.c
index f87a2a25..de75d2ff 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -133,6 +133,9 @@ 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;
+
             char numstring[len-3];
             char message[len-3];
             int i;
@@ -141,13 +144,13 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
                     numstring[i] = line[i+3];
                 } else {
                     int j;
-                    for (j = (i+1); j < len; j++)
+                    for (j = (i+1); j < (len+1); j++)
                         message[j-i-1] = line[j+3];
                     break;
                 }
             }
             int num = atoi(numstring);
-            if (m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1) {
+            if (m_sendmessage(num, (uint8_t*) message, strlen(message) + 1) != 1) {
                 new_lines("[i] could not send message");
             } else {
                 new_lines(format_message(message, -1));
@@ -162,7 +165,7 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
                 name[i-3] = line[i];
             }
             name[i-3] = 0;
-            setname(name, i);
+            setname(name, i - 2);
             char numstring[100];
             sprintf(numstring, "[i] changed nick to %s", (char*)name);
             new_lines(numstring);
@@ -179,7 +182,7 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
                 status[i-3] = line[i];
             }
             status[i-3] = 0;
-            m_set_userstatus(status, strlen((char*)status));
+            m_set_userstatus(status, strlen((char*)status) + 1);
             char numstring[100];
             sprintf(numstring, "[i] changed status to %s", (char*)status);
             new_lines(numstring);