diff --git a/ChangeLog b/ChangeLog
index dc8c24bf..fd04ca7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -159,7 +159,7 @@ CVS code -
   cwd_tab_completion(), browser_init()
 	- Rename variable next to nextdir to avoid confusion. (DLR)
   input_tab()
-	- Since list is a bool, assign it FALSE instead of 0. (DLR)
+	- Since list is a bool, set it to FALSE instead of 0. (DLR)
 	- Add multibyte/wide character support, so that we don't end up
 	  with a string that contains only part of a multibyte
 	  character during tab completion. (DLR)
diff --git a/configure.ac b/configure.ac
index 9c99de43..24b58819 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,7 @@ AC_CONFIG_HEADERS([config.h])
 AC_PREREQ(2.54)
 
 dnl Checks for programs.
+
 AC_GNU_SOURCE
 AC_PROG_CC
 AC_PROG_LN_S
@@ -35,10 +36,12 @@ AC_ISC_POSIX
 AC_SYS_LARGEFILE
 
 dnl Internationalization macros.
+
 AM_GNU_GETTEXT_VERSION(0.11.5)
 AM_GNU_GETTEXT([external], [need-ngettext])
 
 dnl Checks for header files.
+
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h getopt.h libintl.h limits.h regex.h termios.h wchar.h wctype.h)
 AC_CHECK_HEADER(regex.h,
@@ -413,7 +416,6 @@ fi
 dnl Checks for typedefs, structures, and compiler characteristics.
 
 dnl Checks for library functions.
-
 AC_TYPE_SIGNAL
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(getopt_long)
diff --git a/src/chars.c b/src/chars.c
index f0fc67d0..449ec2da 100644
--- a/src/chars.c
+++ b/src/chars.c
@@ -167,7 +167,7 @@ bool is_punct_mbchar(const char *c)
 }
 
 /* Return TRUE for a multibyte character found in a word (currently only
- * an alphanumeric or punctuation character, and the latter only if
+ * an alphanumeric or punctuation character, and only the latter if
  * allow_punct is TRUE) and FALSE otherwise. */
 bool is_word_mbchar(const char *c, bool allow_punct)
 {
diff --git a/src/files.c b/src/files.c
index fddedc7d..04af248f 100644
--- a/src/files.c
+++ b/src/files.c
@@ -68,7 +68,7 @@ filestruct *read_line(char *buf, filestruct *prevnode, bool
 {
     filestruct *fileptr = (filestruct *)nmalloc(sizeof(filestruct));
 
-    /* Convert nulls to newlines.  len is the string's real length
+    /* Convert nulls to newlines.  buf_len is the string's real length
      * here. */
     unsunder(buf, buf_len);
 
diff --git a/src/nano.h b/src/nano.h
index df92597c..20d7c6c9 100644
--- a/src/nano.h
+++ b/src/nano.h
@@ -39,7 +39,7 @@
 #include <limits.h>
 #endif
 
-/* Macros for the flags long. */
+/* Macros for flags. */
 #define SET(bit) flags |= bit
 #define UNSET(bit) flags &= ~bit
 #define ISSET(bit) ((flags & bit) != 0)
diff --git a/src/proto.h b/src/proto.h
index 6465bf59..dc408f41 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -156,7 +156,7 @@ extern bool curses_ended;
 
 extern char *homedir;
 
-/* Functions we want available. */
+/* The functions we want available. */
 
 /* Public functions in chars.c. */
 #ifndef HAVE_ISBLANK