diff --git a/4ed_edit.cpp b/4ed_edit.cpp
index 18e63143..558d891c 100644
--- a/4ed_edit.cpp
+++ b/4ed_edit.cpp
@@ -114,6 +114,7 @@ edit_fix_markers(Models *models, Editing_File *file, Edit edit){
             File_Edit_Positions edit_pos = view_get_edit_pos(view);
             write_cursor_with_index(cursors, &cursor_count, (i32)edit_pos.cursor_pos);
             write_cursor_with_index(cursors, &cursor_count, (i32)view->mark);
+            // TODO(allen): write a cursor for the current scroll line
         }
     }
     
@@ -155,6 +156,7 @@ edit_fix_markers(Models *models, Editing_File *file, Edit edit){
                 view->mark = cursors[cursor_count++].pos;
                 File_Edit_Positions edit_pos = view_get_edit_pos(view);
                 view_set_cursor_and_scroll(models, view, cursor_pos, edit_pos.scroll);
+                // TODO(allen): read a cursor for the current scroll line
             }
         }
         
diff --git a/custom/generated/remapping.h b/custom/generated/remapping.h
index e0198dc8..84ef4274 100644
--- a/custom/generated/remapping.h
+++ b/custom/generated/remapping.h
@@ -25,8 +25,8 @@ setup_default_mapping(Mapping *mapping){
     Bind(close_build_panel,             KeyCode_Comma, KeyCode_Alt);
     Bind(goto_next_jump,                KeyCode_N, KeyCode_Alt);
     Bind(goto_prev_jump,                KeyCode_N, KeyCode_Alt, KeyCode_Shift);
-    Bind(goto_first_jump,               KeyCode_M, KeyCode_Alt, KeyCode_Shift);
     Bind(build_in_build_panel,          KeyCode_M, KeyCode_Alt);
+    Bind(goto_first_jump,               KeyCode_M, KeyCode_Alt, KeyCode_Shift);
     Bind(toggle_filebar,                KeyCode_B, KeyCode_Alt);
     Bind(execute_any_cli,               KeyCode_Z, KeyCode_Alt);
     Bind(execute_previous_cli,          KeyCode_Z, KeyCode_Alt, KeyCode_Shift);
@@ -104,6 +104,7 @@ setup_default_mapping(Mapping *mapping){
     Bind(query_replace_selection,     KeyCode_Q, KeyCode_Alt);
     Bind(reverse_search,              KeyCode_R, KeyCode_Control);
     Bind(save,                        KeyCode_S, KeyCode_Control);
+    Bind(save_all_dirty_buffers,      KeyCode_S, KeyCode_Control, KeyCode_Shift);
     Bind(search_identifier,           KeyCode_T, KeyCode_Control);
     Bind(list_all_locations_of_identifier, KeyCode_T, KeyCode_Control, KeyCode_Shift);
     Bind(paste_and_indent,            KeyCode_V, KeyCode_Control);
@@ -132,7 +133,7 @@ setup_default_mapping(Mapping *mapping){
     Bind(write_todo,                 KeyCode_T, KeyCode_Alt);
     Bind(write_note,                 KeyCode_Y, KeyCode_Alt);
     Bind(list_all_locations_of_type_definition,               KeyCode_D, KeyCode_Alt);
-    Bind(list_all_locations_of_type_definition_of_identifier, KeyCode_T, KeyCode_Alt);
+    Bind(list_all_locations_of_type_definition_of_identifier, KeyCode_T, KeyCode_Alt, KeyCode_Shift);
     Bind(open_long_braces,           KeyCode_LeftBracket, KeyCode_Control);
     Bind(open_long_braces_semicolon, KeyCode_LeftBracket, KeyCode_Control, KeyCode_Shift);
     Bind(open_long_braces_break,     KeyCode_RightBracket, KeyCode_Control, KeyCode_Shift);
@@ -146,23 +147,6 @@ setup_default_mapping(Mapping *mapping){
     Bind(open_file_in_quotes,        KeyCode_1, KeyCode_Alt);
     Bind(open_matching_file_cpp,     KeyCode_2, KeyCode_Alt);
     Bind(write_zero_struct,          KeyCode_0, KeyCode_Control);
-    
-#if 0
-    SelectMap(default_lister_ui_map);
-    ParentMap(mapid_global);
-    BindTextInput(lister__write_character);
-    Bind(lister__quit,     KeyCode_Escape);
-    Bind(lister__activate, KeyCode_Return);
-    Bind(lister__activate, KeyCode_Tab);
-    Bind(lister__backspace_text_field, KeyCode_Backspace);
-    Bind(lister__move_up, KeyCode_Up);
-    Bind(lister__move_down, KeyCode_Down);
-    BindMouseWheel(lister__wheel_scroll);
-    BindMouse(lister__mouse_press, MouseCode_Left);
-    BindMouseRelease(lister__mouse_release, MouseCode_Left);
-    BindMouseMove(lister__repaint);
-    BindCore(lister__repaint, CoreCode_Animate);
-#endif
 }
 
 #endif