diff --git a/4coder_generated/command_metadata.h b/4coder_generated/command_metadata.h
index 00348bda..6a28447f 100644
--- a/4coder_generated/command_metadata.h
+++ b/4coder_generated/command_metadata.h
@@ -258,7 +258,7 @@ static Command_Metadata fcoder_metacmd_table[216] = {
 { PROC_LINKS(close_all_code, 0), "close_all_code", 14,  "Closes any buffer with a filename ending with an extension configured to be recognized as a code file type.", 107, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1060 },
 { PROC_LINKS(close_build_panel, 0), "close_build_panel", 17,  "If the special build panel is open, closes it.", 46, "w:\\4ed\\code\\4coder_build_commands.cpp", 37, 203 },
 { PROC_LINKS(close_panel, 0), "close_panel", 11,  "Closes the currently active panel if it is not the only panel open.", 67, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 487 },
-{ PROC_LINKS(command_lister, 0), "command_lister", 14,  "Opens an interactive list of all registered commands.", 53, "w:\\4ed\\code\\4coder_lists.cpp", 28, 936 },
+{ PROC_LINKS(command_lister, 0), "command_lister", 14,  "Opens an interactive list of all registered commands.", 53, "w:\\4ed\\code\\4coder_lists.cpp", 28, 938 },
 { PROC_LINKS(copy, 0), "copy", 4,  "Copy the text in the range from the cursor to the mark onto the clipboard.", 74, "w:\\4ed\\code\\4coder_clipboard.cpp", 32, 26 },
 { PROC_LINKS(cursor_mark_swap, 0), "cursor_mark_swap", 16,  "Swaps the position of the cursor and the mark.", 46, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 99 },
 { PROC_LINKS(cut, 0), "cut", 3,  "Cut the text in the range from the cursor to the mark onto the clipboard.", 73, "w:\\4ed\\code\\4coder_clipboard.cpp", 32, 35 },
@@ -299,11 +299,11 @@ static Command_Metadata fcoder_metacmd_table[216] = {
 { PROC_LINKS(if0_off, 0), "if0_off", 7,  "Surround the range between the cursor and mark with an '#if 0' and an '#endif'", 78, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 81 },
 { PROC_LINKS(increase_face_size, 0), "increase_face_size", 18,  "Increase the size of the face used by the current buffer.", 57, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 565 },
 { PROC_LINKS(increase_line_wrap, 0), "increase_line_wrap", 18,  "Increases the current buffer's width for line wrapping.", 55, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 543 },
-{ PROC_LINKS(interactive_kill_buffer, 0), "interactive_kill_buffer", 23,  "Interactively kill an open buffer.", 34, "w:\\4ed\\code\\4coder_lists.cpp", 28, 749 },
-{ PROC_LINKS(interactive_new, 0), "interactive_new", 15,  "Interactively creates a new file.", 33, "w:\\4ed\\code\\4coder_lists.cpp", 28, 854 },
-{ PROC_LINKS(interactive_open, 0), "interactive_open", 16,  "Interactively opens a file.", 27, "w:\\4ed\\code\\4coder_lists.cpp", 28, 882 },
-{ PROC_LINKS(interactive_open_or_new, 0), "interactive_open_or_new", 23,  "Interactively open a file out of the file system.", 49, "w:\\4ed\\code\\4coder_lists.cpp", 28, 820 },
-{ PROC_LINKS(interactive_switch_buffer, 0), "interactive_switch_buffer", 25,  "Interactively switch to an open buffer.", 39, "w:\\4ed\\code\\4coder_lists.cpp", 28, 730 },
+{ PROC_LINKS(interactive_kill_buffer, 0), "interactive_kill_buffer", 23,  "Interactively kill an open buffer.", 34, "w:\\4ed\\code\\4coder_lists.cpp", 28, 751 },
+{ PROC_LINKS(interactive_new, 0), "interactive_new", 15,  "Interactively creates a new file.", 33, "w:\\4ed\\code\\4coder_lists.cpp", 28, 856 },
+{ PROC_LINKS(interactive_open, 0), "interactive_open", 16,  "Interactively opens a file.", 27, "w:\\4ed\\code\\4coder_lists.cpp", 28, 884 },
+{ PROC_LINKS(interactive_open_or_new, 0), "interactive_open_or_new", 23,  "Interactively open a file out of the file system.", 49, "w:\\4ed\\code\\4coder_lists.cpp", 28, 822 },
+{ PROC_LINKS(interactive_switch_buffer, 0), "interactive_switch_buffer", 25,  "Interactively switch to an open buffer.", 39, "w:\\4ed\\code\\4coder_lists.cpp", 28, 732 },
 { PROC_LINKS(kill_buffer, 0), "kill_buffer", 11,  "Kills the current buffer.", 25, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1543 },
 { PROC_LINKS(left_adjust_view, 0), "left_adjust_view", 16,  "Sets the left size of the view near the x position of the cursor.", 65, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 136 },
 { PROC_LINKS(list_all_functions_all_buffers, 0), "list_all_functions_all_buffers", 30,  "Creates a jump list of lines from all buffers that appear to define or declare functions.", 89, "w:\\4ed\\code\\4coder_function_list.cpp", 36, 358 },
@@ -355,7 +355,7 @@ static Command_Metadata fcoder_metacmd_table[216] = {
 { PROC_LINKS(newline_or_goto_position_sticky, 0), "newline_or_goto_position_sticky", 31,  "If the buffer in the active view is writable, inserts a character, otherwise performs goto_jump_at_cursor.", 106, "w:\\4ed\\code\\4coder_jump_sticky.cpp", 34, 573 },
 { PROC_LINKS(open_all_code, 0), "open_all_code", 13,  "Open all code in the current directory. File types are determined by extensions. An extension is considered code based on the extensions specified in 4coder.config.", 164, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1067 },
 { PROC_LINKS(open_all_code_recursive, 0), "open_all_code_recursive", 23,  "Works as open_all_code but also runs in all subdirectories.", 59, "w:\\4ed\\code\\4coder_project_commands.cpp", 39, 1074 },
-{ PROC_LINKS(open_color_tweaker, 0), "open_color_tweaker", 18,  "Opens the 4coder theme selector list.", 37, "w:\\4ed\\code\\4coder_lists.cpp", 28, 898 },
+{ PROC_LINKS(open_color_tweaker, 0), "open_color_tweaker", 18,  "Opens the 4coder theme selector list.", 37, "w:\\4ed\\code\\4coder_lists.cpp", 28, 900 },
 { PROC_LINKS(open_file_in_quotes, 0), "open_file_in_quotes", 19,  "Reads a filename from surrounding '\"' characters and attempts to open the corresponding file.", 94, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1450 },
 { PROC_LINKS(open_in_other, 0), "open_in_other", 13,  "Interactively opens a file in the other panel.", 46, "w:\\4ed\\code\\4coder_base_commands.cpp", 36, 1601 },
 { PROC_LINKS(open_long_braces, 0), "open_long_braces", 16,  "At the cursor, insert a '{' and '}' separated by a blank line.", 62, "w:\\4ed\\code\\4coder_combined_write_commands.cpp", 46, 57 },
diff --git a/4coder_lists.cpp b/4coder_lists.cpp
index f9881613..1a036352 100644
--- a/4coder_lists.cpp
+++ b/4coder_lists.cpp
@@ -522,9 +522,11 @@ generate_hot_directory_file_list(Application_Links *app, Partition *arena, Liste
     {
         Temp_Memory temp = begin_temp_memory(arena);
         String hot = get_hot_directory(app, arena);
-        if (hot.str[hot.size - 1] != '/' &&
-            hot.str[hot.size - 1] != '\\'){
-            append_s_char(&hot, '/');
+        if (hot.size > 0 && hot.str[hot.size - 1] != '/' && hot.str[hot.size - 1] != '\\'){
+            if (push_array(arena, char, 1) != 0){
+                hot.memory_size += 1;
+                append_s_char(&hot, '/');
+            }
         }
         lister_set_text_field_string(lister, hot);
         lister_set_key_string(lister, front_of_directory(hot));
diff --git a/4ed_api_implementation.cpp b/4ed_api_implementation.cpp
index cb5754c2..f70aec9a 100644
--- a/4ed_api_implementation.cpp
+++ b/4ed_api_implementation.cpp
@@ -3697,10 +3697,13 @@ DOC_SEE(File_List)
     System_Functions *system = cmd->system;
     Partition *part = &cmd->models->mem.part;
     File_List result = {};
-    Temp_Memory temp = begin_temp_memory(part);
-    String str = push_string(part, dir, len);
-    system->set_file_list(&result, str.str, 0, 0, 0);
-    end_temp_memory(temp);
+    Editing_File_Name canon = {};
+    if (get_canon_name(system, make_string(dir, len), &canon)){
+        Temp_Memory temp = begin_temp_memory(part);
+        String str = push_string(part, canon.name.str, canon.name.size);
+        system->set_file_list(&result, str.str, 0, 0, 0);
+        end_temp_memory(temp);
+    }
     return(result);
 }
 
diff --git a/4ed_working_set.cpp b/4ed_working_set.cpp
index 4f982c83..3b3cdde3 100644
--- a/4ed_working_set.cpp
+++ b/4ed_working_set.cpp
@@ -384,21 +384,16 @@ working_set_clipboard_roll_down(Working_Set *working){
 ////////////////////////////////
 
 internal b32
-get_canon_name(System_Functions *system, String filename,
-               Editing_File_Name *canon_name){
+get_canon_name(System_Functions *system, String filename, Editing_File_Name *canon_name){
     canon_name->name = make_fixed_width_string(canon_name->name_);
-    
     canon_name->name.size = system->get_canonical(filename.str, filename.size, canon_name->name.str, canon_name->name.memory_size);
     terminate_with_null(&canon_name->name);
-    
     b32 result = (canon_name->name.size != 0);
     return(result);
 }
 
 internal void
-buffer_bind_file(System_Functions *system, Heap *heap,
-                 Working_Set *working_set,
-                 Editing_File *file, String canon_filename){
+buffer_bind_file(System_Functions *system, Heap *heap, Working_Set *working_set, Editing_File *file, String canon_filename){
     Assert(file->unique_name.name.size == 0);
     Assert(file->canon.name.size == 0);
     
diff --git a/todo.txt b/todo.txt
index 024c2c71..e18b1ba5 100644
--- a/todo.txt
+++ b/todo.txt
@@ -13,7 +13,7 @@
         [x] Crash when freeing marker object without visuals
         [x] High CPU usage in listers (endless animation bug)
         [x] Panel resizing doesn't work
-        [] On windows file lister: /foo/bar.txt
+        [x] On windows file lister: /foo/bar.txt
         [] Notepad like mode clicking to new view doesn't snap the mark
         [] Notepad like mode replacing text with cursor at end of selection in middle of long file
         [] Tab when no valid completions in open file lister
@@ -21,6 +21,7 @@
         [] Texture binding changes too often problem.
         [] SSHFS segfault on linux
         [] New file when the file is already open
+        [] crash on obj file (san-miguel-low-poly.obj)
         Repro Needed
         {
             [] pasting long comment at top of code files doesn't always parse right away???