diff --git a/src/getchar.c b/src/getchar.c
index a6644d8..bdf0272 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -8,12 +8,8 @@
  */
 
 /*
- * getchar.c
- *
- * functions related with getting a character from the user/mapping/redo/...
- *
- * manipulations with redo buffer and stuff buffer
- * mappings and abbreviations
+ * getchar.c: Code related to getting a character from the user or a script
+ * file, manipulations with redo buffer and stuff buffer.
  */
 
 #include "vim.h"
@@ -2633,7 +2629,7 @@
 		keylen = KEYLEN_PART_KEY;
 
 	    // If no termcode matched, try to include the modifier into the
-	    // key.  This for when modifyOtherKeys is working.
+	    // key.  This is for when modifyOtherKeys is working.
 	    if (keylen == 0 && !no_reduce_keys)
 		keylen = check_simplify_modifier(max_mlen + 1);
 
diff --git a/src/map.c b/src/map.c
index 4787400..a958803 100644
--- a/src/map.c
+++ b/src/map.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * map.c: functions for maps and abbreviations
+ * map.c: Code for mappings and abbreviations.
  */
 
 #include "vim.h"
@@ -659,9 +659,9 @@
 	// Find an entry in the maphash[] list that matches.
 	// For :unmap we may loop two times: once to try to unmap an entry with
 	// a matching 'from' part, a second time, if the first fails, to unmap
-	// an entry with a matching 'to' part. This was done to allow ":ab foo
-	// bar" to be unmapped by typing ":unab foo", where "foo" will be
-	// replaced by "bar" because of the abbreviation.
+	// an entry with a matching 'to' part. This was done to allow
+	// ":ab foo bar" to be unmapped by typing ":unab foo", where "foo" will
+	// be replaced by "bar" because of the abbreviation.
 	for (round = 0; (round == 0 || maptype == 1) && round <= 1
 					       && !did_it && !got_int; ++round)
 	{
diff --git a/src/version.c b/src/version.c
index f75c08b..cf05293 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    3643,
+/**/
     3642,
 /**/
     3641,