diff --git a/config.h b/config.h
index 6430e313..2c78aad0 100644
--- a/config.h
+++ b/config.h
@@ -88,7 +88,6 @@ enum key_binding_type {
 typedef tll(char *) config_modifier_list_t;
 
 struct config_key_binding {
-    // TODO (kociap): from wayland.h?
     int action;  /* One of the various bind_action_* enums from wayland.h */
     //struct config_key_modifiers modifiers;
     config_modifier_list_t modifiers;
@@ -365,17 +364,13 @@ struct config {
          * Special modes
          */
 
-        /* 
-         * Bindings for vimode. 
-         * Note: action to enter vimode is in the 'key' bindings
-         * above.
-         */
+         
+        // Bindings for vimode. 
+        // Actions to enter vimode is in the 'key' bindings above.
         struct config_key_binding_list vimode;
-        /*
-         * Bindings for the search mode within vimode.
-         * Actions to enter the search mode are in the 'key' and
-         * 'vimode' bindings.
-         */
+        // Bindings for the search mode within vimode.
+        // Actions to enter the search mode are in the 'key' and
+        // 'vimode' bindings.
         struct config_key_binding_list vimode_search;
 
         /* While showing URL jump labels */
diff --git a/render.c b/render.c
index 220176b9..793d4ece 100644
--- a/render.c
+++ b/render.c
@@ -809,6 +809,7 @@ render_cell(struct terminal *term, pixman_image_t *pix,
         const bool is_highlighted = 
             is_cell_highlighted(term, (struct coord){.row = row_no, .col = col});
         if(is_highlighted) {
+            // TODO (kociap): Do the same thing as for selection colors.
             if(term->conf->colors.use_custom.highlights) {
                 _fg = term->conf->colors.highlights.fg;
                 _bg = term->conf->colors.highlights.bg;
diff --git a/terminal.h b/terminal.h
index 2f3dcae0..1258ced3 100644
--- a/terminal.h
+++ b/terminal.h
@@ -657,10 +657,8 @@ struct terminal {
             enum search_direction direction;
         } confirmed_search;
 
-        /*
-         * Highlight ranges in absolute coordinates.
-         * Sorted in ascending order by the start row and column.
-         */
+        // Highlight ranges in absolute coordinates.
+        // Sorted in ascending order by the start row and column.
         struct highlight_location {
             struct highlight_location const* next;
             struct range range;
diff --git a/vimode.c b/vimode.c
index 62041351..24da5955 100644
--- a/vimode.c
+++ b/vimode.c
@@ -17,10 +17,8 @@
 #include "vimode.h"
 #include "xmalloc.h"
 
-// TODO (kociap): consider adding scrolloff.
-// TODO (kociap): consider not cancelling selection on scroll.
-// TODO (kociap): jump list?
-// TODO (kociap): WORD motions.
+// TODO (kociap): consider not cancelling selection on lines being
+// scrolled out.
 
 static bool is_mode_visual(enum vi_mode const mode)
 {
@@ -1357,6 +1355,8 @@ static void execute_vimode_binding(struct seat *seat, struct terminal *term,
             mode = VI_MODE_VBLOCK;
         }
 
+        // TODO (kociap): selection start is in view relative, so scrolling and
+        // changing mode will alter the start position.
         enum selection_kind const selection = selection_kind_from_vi_mode(mode);
         if (is_mode_visual(term->vimode.mode)) {
             // "Entering" the same mode exits it. Otherwise, we switch from