diff --git a/src/nano.c b/src/nano.c
index 66962fa489cd5ed60fdde597c75d885adcc3ca46..16fa6042434a7c2ea74ccc1435f01df7de8de89d 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1468,9 +1468,9 @@ void do_enter(void)
 }
 
 #ifndef NANO_SMALL
-/* Move to the next word.  If allow_update is FALSE, don't update the
- * screen afterward.  Return TRUE if we started on a word, and FALSE
- * otherwise. */
+/* Move to the next word in the current filestruct.  If allow_update is
+ * FALSE, don't update the screen afterward.  Return TRUE if we started
+ * on a word, and FALSE otherwise. */
 bool do_next_word(bool allow_update)
 {
     size_t pww_save = placewewant;
@@ -1548,7 +1548,7 @@ void do_next_word_void(void)
     do_next_word(TRUE);
 }
 
-/* Move to the previous word. */
+/* Move to the previous word in the current filestruct. */
 void do_prev_word(void)
 {
     size_t pww_save = placewewant;
@@ -3987,8 +3987,8 @@ bool do_mouse(void)
 }
 #endif /* !DISABLE_MOUSE */
 
-/* The user typed kbinput_len multibyte characters.  Add them to the
- * edit buffer, filtering out all control characters if allow_cntrls is
+/* The user typed ouuput_len multibyte characters.  Add them to the edit
+ * buffer, filtering out all control characters if allow_cntrls is
  * TRUE. */
 void do_output(char *output, size_t output_len, bool allow_cntrls)
 {
diff --git a/src/winio.c b/src/winio.c
index 6935be41bb395226057fb9caa93909f90ad1fcea..b34eadd55ccfb8caec2abc00457e9af78f9bd52f 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -39,7 +39,8 @@ static int *key_buffer = NULL;
 static size_t key_buffer_len = 0;
 				/* The length of the default keystroke
 				 * buffer. */
-static int statusblank = 0;	/* The number of keystrokes left after
+static int statusblank = 0;
+				/* The number of keystrokes left after
 				 * we call statusbar(), before we
 				 * actually blank the statusbar. */
 static size_t statusbar_x = (size_t)-1;
@@ -1886,6 +1887,7 @@ void do_statusbar_delete(void)
     }
 }
 
+/* Move text from the statusbar prompt into oblivion. */
 void do_statusbar_cut_text(void)
 {
     assert(answer != NULL);
@@ -1903,6 +1905,7 @@ void do_statusbar_cut_text(void)
 }
 
 #ifndef NANO_SMALL
+/* Move to the next word at the statusbar prompt. */
 void do_statusbar_next_word(void)
 {
     char *char_mb;
@@ -1945,6 +1948,7 @@ void do_statusbar_next_word(void)
     free(char_mb);
 }
 
+/* Move to the previous word at the statusbar prompt. */
 void do_statusbar_prev_word(void)
 {
     char *char_mb;
@@ -2051,6 +2055,9 @@ void do_statusbar_verbatim_input(bool *got_enter)
     free(output);
 }
 
+/* The user typed ouuput_len multibyte characters.  Add them to the
+ * statusbar prompt, setting got_enter to TRUE if we get a newline, and
+ * filtering out all control characters if allow_cntrls is TRUE. */
 void do_statusbar_output(char *output, size_t output_len, bool
 	*got_enter, bool allow_cntrls)
 {