diff --git a/src/chat.c b/src/chat.c
index 632d5b5..8dc3202 100644
--- a/src/chat.c
+++ b/src/chat.c
@@ -102,15 +102,27 @@ static void chat_onStatusMessageChange(ToxWindow *self, int num, uint8_t *status
 static void chat_onFileSendRequest(ToxWindow *self, Tox *m, int num, uint8_t filenum, 
                                    uint64_t filesize, uint8_t *pathname, uint16_t path_len)
 {
-    if (self-> num != num)
+    if (self->num != num)
         return;
 
     ChatContext *ctx = (ChatContext *) self->chatwin;
 
-    wprintw(ctx->history, "File transfer request for '%s' (%llu bytes).\n", pathname, 
+    /* try to get file name from path */
+    uint8_t *filename = strrchr(pathname, '/');    // Try unix style paths
+    
+    if (filename != NULL) {
+        ++filename;
+    } else {
+        filename = strrchr(pathname, '\\');    // Try windows style paths
+
+        if (filename == NULL)
+            filename = pathname;
+    }
+
+    wprintw(ctx->history, "File transfer request for '%s' (%llu bytes).\n", filename, 
             (long long unsigned int)filesize);
 
-    if (filenum > MAX_FILENUMBER) {
+    if (filenum >= MAX_FILENUMBER) {
         wprintw(ctx->history, "Too many pending file requests; discarding.\n");
         return;
     }
@@ -118,10 +130,10 @@ static void chat_onFileSendRequest(ToxWindow *self, Tox *m, int num, uint8_t fil
     wprintw(ctx->history, "Type '/savefile %d' to accept the file transfer.\n", filenum);
 
     pending_file_transfers[filenum] = num;
+    strcpy(filenames[filenum], filename);
 
     self->blink = true;
     beep();
-
 }
 
 static void chat_onFileControl(ToxWindow *self, Tox *m, int num, uint8_t receive_send, 
@@ -133,14 +145,17 @@ static void chat_onFileControl(ToxWindow *self, Tox *m, int num, uint8_t receive
     ChatContext *ctx = (ChatContext *) self->chatwin;
 
     switch(control_type) {
-    case 0:
+    case TOX_FILECONTROL_ACCEPT:
         wprintw(ctx->history, "File transfer accepted.\n");
         break;
-    case 3:
-        wprintw(ctx->history, "File successfully recieved.\n");
+    case TOX_FILECONTROL_PAUSE:
+        wprintw(ctx->history, "File transfer paused.\n");
         break;
-    default:
-        wprintw(ctx->history, "Control %u receieved.\n", control_type);
+    case TOX_FILECONTROL_KILL:
+        wprintw(ctx->history, "File transfer failed.\n");
+        break;
+    case TOX_FILECONTROL_FINISHED:
+        wprintw(ctx->history, "File successfully recieved.\n");
         break;
     }
 
@@ -156,10 +171,8 @@ static void chat_onFileData(ToxWindow *self, Tox *m, int num, uint8_t filenum, u
 
     ChatContext *ctx = (ChatContext *) self->chatwin;
 
-    char pathname[MAX_STR_SIZE];
-    snprintf(pathname, sizeof(pathname), "%d.%u.bin", num, filenum);
-
-    FILE *file_to_save = fopen(pathname, "a");
+    uint8_t *filename = filenames[filenum];
+    FILE *file_to_save = fopen(filename, "a");
 
     if (fwrite(data, length, 1, file_to_save) != 1) {
         wattron(ctx->history, COLOR_PAIR(RED));
@@ -221,12 +234,11 @@ static void chat_sendfile(ToxWindow *self, ChatContext *ctx, Tox *m, uint8_t *pa
     memcpy(file_senders[num_file_senders].pathname, path, path_len + 1);
     file_senders[num_file_senders].chatwin = ctx->history;
     file_senders[num_file_senders].file = file_to_send;
-    file_senders[num_file_senders].filenum = filenum;
+    file_senders[num_file_senders].filenum = (uint8_t) filenum;
     file_senders[num_file_senders].friendnum = friendnum;
     file_senders[num_file_senders].piecelen = fread(file_senders[num_file_senders].nextpiece, 1,
                                                     tox_filedata_size(m, friendnum), file_to_send);
 
-
     wprintw(ctx->history, "Sending file '%s'...\n", path);
     ++num_file_senders;
 }
diff --git a/src/commands.c b/src/commands.c
index ecca0ba..0ef9a94 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -31,7 +31,7 @@ void cmd_accept(WINDOW *window, ToxWindow *prompt, Tox *m, int argc, char **argv
 
     int num = atoi(argv[1]);
 
-    if (num < 0 || num > num_frnd_requests) {
+    if (num < 0 || num >= MAX_FRIENDS_NUM) {
         wprintw(window, "No pending friend request with that number.\n");
         return;
     }
@@ -205,16 +205,16 @@ void cmd_savefile(WINDOW *window, ToxWindow *prompt, Tox *m, int argc, char **ar
 
     uint8_t filenum = atoi(argv[1]);
 
-    if (filenum < 0 || filenum > MAX_FILENUMBER) {
+    if (filenum < 0 || filenum >= MAX_FILENUMBER) {
         wprintw(window, "File transfer failed.\n");
         return;
     }
 
     int friendnum = pending_file_transfers[filenum];
+    uint8_t *filename = filenames[filenum];
 
-    if (tox_file_sendcontrol(m, friendnum, 1, filenum, 0, 0, 0))
-        wprintw(window, "Accepted file transfer %u. Saving file as %d.%u.bin.\n", filenum, friendnum,
-                filenum);
+    if (tox_file_sendcontrol(m, friendnum, 1, filenum, TOX_FILECONTROL_ACCEPT, 0, 0))
+        wprintw(window, "Accepted file transfer %u. Saving file as: '%s'.\n", filenum, filename);
     else
         wprintw(window, "File transfer failed.\n");
 }
diff --git a/src/toxic_windows.h b/src/toxic_windows.h
index 0c592a1..db5ff64 100644
--- a/src/toxic_windows.h
+++ b/src/toxic_windows.h
@@ -104,7 +104,7 @@ typedef struct {
 typedef struct {
     FILE *file;
     WINDOW *chatwin;
-    uint16_t friendnum;
+    int friendnum;
     uint8_t filenum;
     uint8_t nextpiece[FILE_PIECE_SIZE];
     uint16_t piecelen;
@@ -115,6 +115,7 @@ FileSender file_senders[NUM_FILE_SENDERS];
 uint8_t num_file_senders;
 
 uint8_t pending_file_transfers[MAX_FILENUMBER];
+uint8_t filenames[MAX_FILENUMBER][MAX_STR_SIZE];
 
 /* End file transfer code */