9 files changed, 114 insertions, 24 deletions

diff --git a/INSTALL.md b/INSTALL.md
index 3459a5c7..9efa7ee9 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -42,7 +42,17 @@ make
 
 ###OSX:
 
-Much the same as above, remember to install the latest XCode and the developer tools (Preferences -> Downloads -> Command Line Tools).
+####Homebrew:
+```
+brew install libtool automake autoconf libconfig libsodium
+cmake .
+make
+sudo make install
+```
+
+####Non-homebrew:
+
+Much the same as Linux, remember to install the latest XCode and the developer tools (Preferences -> Downloads -> Command Line Tools).
 Users running Mountain Lion and the latest version of XCode (4.6.3) will also need to install libtool, automake and autoconf.
 They are easy enough to install, grab them from http://www.gnu.org/software/libtool/, http://www.gnu.org/software/autoconf/ and http://www.gnu.org/software/automake/, then follow these steps for each:
 
diff --git a/README.md b/README.md
index e6e6fe5d..19bbb759 100644
--- a/README.md
+++ b/README.md
@@ -20,14 +20,14 @@ With the rise of governmental monitoring programs, Tox aims to be an easy to use
 + Every peer is represented as a byte string (the public key of the peer [client id])
 + We're using torrent-style DHT so that peers can find the IP of the other peers when they have their ID.
 + Once the client has the IP of that peer, they start initiating a secure connection with each other. (See [Crypto](https://github.com/irungentoo/ProjectTox-Core/wiki/Crypto))
-+ When both peers are securely connect with the encryption, they can securely exchange messages, initiate a video chat, send files, etc.<br />
++ When both peers are securely connected, they can exchange messages, initiate a video chat, send files, etc, all using encrypted communications.<br />
 + Current build status: [![Build Status](https://travis-ci.org/irungentoo/ProjectTox-Core.png?branch=master)](https://travis-ci.org/irungentoo/ProjectTox-Core) 
 
 ## Roadmap:
 - [x] Get our DHT working perfectly.(Done, needs large scale testing though.)
 - [x] Reliable connection (See Lossless_UDP protocol) to other peers according to client id. (Done, see DHT_sendfiletest.c for an example)
 - [x] Encryption. (Done)
-- [ ] Get a simple text only im client working perfectly. (This is where we are)
+- [ ] Get a simple text only IM client working perfectly. (This is where we are)
 - [ ] Streaming media
 - [ ] ???
 
diff --git a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
index 8e278b28..4f28fb3c 100644
--- a/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
+++ b/other/bootstrap_serverdaemon/DHT_bootstrap_daemon.c
@@ -123,11 +123,12 @@ void manage_keys(char *keys_file)
 {
     const uint32_t KEYS_SIZE = crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES;
     uint8_t keys[KEYS_SIZE];
-
-    /* TODO: stat the file before trying to open it. We aren't cave people! */
-    FILE *keysf = fopen(keys_file, "r");
-    if (keysf != NULL) {
-        /* if file was opened successfully -- load keys */
+    struct stat existence;
+    FILE *keysf;
+    
+    /* Check if file exits, proceed to open and load keys */
+    if(stat(keys_file,&existence) >= 0) {
+        keysf = fopen(keys_file, "r");
         size_t read_size = fread(keys, sizeof(uint8_t), KEYS_SIZE, keysf);
         if (read_size != KEYS_SIZE) {
             printf("Error while reading the key file\nExiting.\n");
diff --git a/start_guide.de.md b/start_guide.de.md
new file mode 100644
index 00000000..7dfd52ca
--- /dev/null
+++ b/start_guide.de.md
@@ -0,0 +1,40 @@
+# Tox nutzen
+1. Tox erstellen
+2. Fehler korrigieren
+3. Im IRC nach Hilfe fragen
+4. Auf Debug-Reise für Entwickler
+5. Tox wirklich erstellen
+6. ???
+ 
+Trotz der ganzen Arbeit, die wir bisher in Tox
+gesteckt haben, gibt es noch keine richtige
+Anleitung, wie man Tox _benutzt_.
+Dies ist ein anwenderfreundlicher Versuch.
+
+1. Verbinde dich zum Netzwerk!
+    + Du musst dich zu einem Bootstrap-Server verbinden, um einen öffentlichen Schlüssel zu erhalten.
+    + Wo finde ich einen öffentlichen Server? Zur Zeit hier:
+      (die Hilfe-Nachricht von nTox ohne Kommandos hilft auch)
+        + 198.46.136.167 33445 728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854
+        + 192.81.133.111 33445 8CD5A9BF0A6CE358BA36F7A653F99FA6B258FF756E490F52C1F98CC420F78858
+        + 66.175.223.88 33445  AC4112C975240CAD260BB2FCD134266521FAAF0A5D159C5FD3201196191E4F5D
+        + 192.184.81.118 33445 5CD7EB176C19A2FD840406CD56177BB8E75587BB366F7BB3004B19E3EDC04143
+2. Finde einen Freund!
+    + Jetzt, da du im Netzwerk bist, brauchst du einen Freund. Um einen zu bekommen,
+      musst du eine Anfrage senden oder erhalten. Was eine Anfrage ist?
+      Es ist wie eine Freundschaftsanfrage, jedoch benutzen wir unglaublich schaurige
+      und kryptische Nummern anstatt Namen. When nTox startet, erscheint _deine_ lange,
+      schaurige Nummer, auch *öffentlicher Schlüssel* genannt. Diesen kannst du an
+      andere Personen weitergeben und sie können dich als "Freund" hinzufügen. Oder du
+      fügst andere Personen mit dem */f*-Befehl hinzu, wenn du möchtest.
+3. Chatte drauf los!
+    + Benutze nun den */m*-Befehl, um eine Nachricht an jemanden zu senden. Wow, du chattest!
+4. Mach etwas kaputt!
+    + Jep, pre-alpha-alpha-Software stürzt manchmal ab. Wir arbeiten daran.
+    + Bitte melde alle Abstürze entweder an die GitHub-Seite oder #tox-dev im freenode-IRC.
+5. Nichts ist kaputt, aber was bedeutet */f*?
+    + nTox liest einen Text als Befehl, wenn das erste Zeichen ein Schrägstrich ist ('/').
+      Du kannst alle Befehle in commands.md nachlesen.
+6. Benutze und unterstütze Tox!
+    + Programmiere, debugge, dokumentiere, übersetze für uns, oder sprich einfach über uns!
+    + Je mehr Interesse wir erhalten, desto mehr Arbeit wird getan und desto besser wird Tox.
diff --git a/start_guide.md b/start_guide.md
new file mode 100644
index 00000000..b4f4310d
--- /dev/null
+++ b/start_guide.md
@@ -0,0 +1,38 @@
+# Using Tox
+1. Build Tox
+2. Fix errors
+3. Consult IRC for help
+4. Go on debugging journy for devs
+5. Build Tox for real
+6. ???
+
+For all the work we've put into Tox so far,
+there isn't yet a decent guide for how you _use_
+Tox. Here's a user-friendly attempt at it.
+
+1. Connect to the network!
+    + You need to connect to a bootstrapping server, to give you a public key.
+    + Where can I find a public server? Right here, as of now:
+      (the help message from running nTox with no args will help)
+        + 198.46.136.167 33445 728925473812C7AAC482BE7250BCCAD0B8CB9F737BF3D42ABD34459C1768F854
+        + 192.81.133.111 33445 8CD5A9BF0A6CE358BA36F7A653F99FA6B258FF756E490F52C1F98CC420F78858
+        + 66.175.223.88 33445  AC4112C975240CAD260BB2FCD134266521FAAF0A5D159C5FD3201196191E4F5D
+        + 192.184.81.118 33445 5CD7EB176C19A2FD840406CD56177BB8E75587BB366F7BB3004B19E3EDC04143
+2. Find a friend!
+    + Now that you're on the network, you need a friend. To get one of those,
+       you need to to send or receive a request. What's a request, you ask?
+       It's like a friend request, but we use really scary and cryptic numbers
+       instead of names. When nTox starts, it shows your _your_ long, scary number,
+       called your *public key*. Give that to people, and they can add you as
+       as "friend". Or, you can add someone else, with the */f* command, if you like.
+3. Chat it up!
+    + Now use the */m* command to send a message to someone. Wow, you're chatting!
+4. But something broke!
+    + Yeah, pre-alpha-alpha software tends to do that. We're working on it.
+    + Please report all crashes to either the github page, or #tox-dev on freenode.
+5. Nothing broke, but what does */f* mean?
+    + nTox parses text as a command if the first character is a forward-slash ('/').
+      You can check all commands in commands.md.
+6. Use and support Tox!
+    + Code for us, debug for us, document for us, translate for us, even just talk about us!
+    + The more interest we get, the more work gets done, the better Tox is.
diff --git a/testing/DHT_cryptosendfiletest.c b/testing/DHT_cryptosendfiletest.c
index c7c33531..888dac0f 100644
--- a/testing/DHT_cryptosendfiletest.c
+++ b/testing/DHT_cryptosendfiletest.c
@@ -186,7 +186,7 @@ int main(int argc, char *argv[])
                     fclose(file2);
                 }
             }
-                        /* if buffer is empty and the connection timed out. */
+            /* if buffer is empty and the connection timed out. */
             else if(is_cryptoconnected(inconnection) == 4) {
                 crypto_kill(inconnection);
             }
@@ -209,7 +209,7 @@ int main(int argc, char *argv[])
                     fclose(file2);
                 }
             }
-                        /* if buffer is empty and the connection timed out. */
+            /* if buffer is empty and the connection timed out. */
             else if(is_cryptoconnected(connection) == 4) {
                 crypto_kill(connection);
             }
diff --git a/testing/nTox.c b/testing/nTox.c
index 5c560079..6aef1d7b 100644
--- a/testing/nTox.c
+++ b/testing/nTox.c
@@ -35,6 +35,8 @@
 
 char lines[HISTORY][STRING_LENGTH];
 char line[STRING_LENGTH];
+char *help = "[i] commands: /f ID (to add friend), /m friendnumber message  (to send message), /s status (to change status)\n"
+             "[i] /l list (list friends), /h for help, /i for info, /n nick (to change nickname), /q (to quit)";
 int x,y;
 
 uint8_t pending_requests[256][CLIENT_ID_SIZE];
@@ -72,13 +74,13 @@ void print_friendlist()
 
 char *format_message(char *message, int friendnum)
 {
-        char name[MAX_NAME_LENGTH];
-        if(friendnum != -1) {
-                getname(friendnum, (uint8_t*)name);
-        } else {
-                getself_name((uint8_t*)name);
-        }
-        char *msg = malloc(100+strlen(message)+strlen(name)+1);
+    char name[MAX_NAME_LENGTH];
+    if(friendnum != -1) {
+        getname(friendnum, (uint8_t*)name);
+    } else {
+        getself_name((uint8_t*)name);
+    }
+    char *msg = malloc(100+strlen(message)+strlen(name)+1);
     time_t rawtime;
     struct tm * timeinfo;
     time ( &rawtime );
@@ -129,7 +131,7 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
             if(m_sendmessage(num, (uint8_t*) message, sizeof(message)) != 1) {
                 new_lines("[i] could not send message");
             } else {
-                        new_lines(format_message(message, -1));
+                new_lines(format_message(message, -1));
             }
         }
         else if (line[1] == 'n') {
@@ -176,8 +178,7 @@ void line_eval(char lines[HISTORY][STRING_LENGTH], char *line)
         }
         
        else if (line[1] == 'h') { //help
-           new_lines("[i] commands: /f ID (to add friend), /m friendnumber message  (to send message), /s status (to change status)");
-           new_lines("[i] /l list (list friends), /h for help, /i for info, /n nick (to change nickname), /q (to quit)");
+           new_lines(help);
         }
       
        else if (line[1] == 'i') { //info
@@ -389,8 +390,7 @@ int main(int argc, char *argv[])
     raw();
     getmaxyx(stdscr,y,x);
     new_lines(idstring0);
-    new_lines("[i] commands: /f ID (to add friend), /m friendnumber message  (to send message), /s status (to change status)");
-    new_lines("[i] /l list (list friends), /h for help, /i for info, /n nick (to change nickname), /q (to quit)");
+    new_lines(help);
     strcpy(line, "");
     IP_Port bootstrap_ip_port;
     bootstrap_ip_port.port = htons(atoi(argv[2]));
diff --git a/testing/nTox_win32.c b/testing/nTox_win32.c
index 3a9caaf5..a870c210 100644
--- a/testing/nTox_win32.c
+++ b/testing/nTox_win32.c
@@ -317,6 +317,7 @@ int main(int argc, char *argv[])
         }
 
         doMessenger();
+        Sleep(1);
     }
 
     return 0;
diff --git a/testing/toxic/prompt.c b/testing/toxic/prompt.c
index 22d9eb9e..0cd10730 100644
--- a/testing/toxic/prompt.c
+++ b/testing/toxic/prompt.c
@@ -125,8 +125,8 @@ static void execute(ToxWindow* self, char* cmd) {
       xx[2] = '\0';
 
       if(sscanf(xx, "%02x", &x) != 1) {
-        wprintw(self->window, "Invalid ID.\n");
-        return;
+        wprintw(self->window, "Invalid ID.\n");
+        return;
       }
 
       id_bin[i] = x;