2 files changed, 23 insertions, 2 deletions

diff --git a/README.md b/README.md
index 5785e9cb..56160ce2 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ With the rise of governmental monitoring programs, Tox aims to be an easy to use
 
 **How to build Tox on Linux**: [YouTube video](http://www.youtube.com/watch?v=M4WXE4VKmyg)<br />
 **How to use Tox on Windows**: [YouTube video](http://www.youtube.com/watch?v=qg_j_sDb6WQ)<br />
-**For Mac OSX read INSTALL.md**
+**For Mac OSX read** [INSTALL.md](INSTALL.md)
 
 ### Objectives:
 
@@ -35,7 +35,7 @@ Keep everything really simple.
 - [  ] Streaming media
 - [  ] ???
 
-For further information, check our [To-do list](https://github.com/irungentoo/ProjectTox-Core/wiki/TODO)
+For further information, check our [To-do list](http://wiki.tox.im/index.php/TODO)
 
 ### Why are you doing this? There are already a bunch of free skype alternatives.
 The goal of this project is to create a configuration-free P2P skype 
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index cdc6dc16..c596b708 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -280,6 +280,26 @@ void prepare_window(WINDOW* w) {
   wresize(w, LINES-2, COLS);
 }
 
+/* 
+ * Draws cursor relative to input on prompt window.
+ * Removes cursor on friends window and chat windows.
+ *
+ * TODO: Make it work for chat windows
+ */
+void position_cursor(WINDOW* w, char* title)
+{
+  curs_set(1);
+  if (strcmp(title, "[prompt]") == 0) {    // main/prompt window
+    int x, y;
+    getyx(w, y, x);
+    move(y, x);
+  }
+  else if (strcmp(title, "[friends]") == 0)    // friends window
+    curs_set(0);
+  else    // any other window (i.e chat)
+    curs_set(0);
+}
+
 int main(int argc, char* argv[]) {
   int ch;
   ToxWindow* a;
@@ -299,6 +319,7 @@ int main(int argc, char* argv[]) {
     a->blink = false;
     a->onDraw(a);
     draw_bar();
+    position_cursor(a->window, a->title);
 
     // Handle input.
     ch = getch();