diff --git a/configure.ac b/configure.ac
index bc89a44f..abd73b1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -689,7 +689,7 @@ AC_SUBST(LIBMD)
 if test "$with_skey" = "yes"; then
 	AC_CHECK_LIB(md, MD5Init, [LIBMD=-lmd])
 	AC_CHECK_LIB(skey, skeychallenge, [LIBSKEY=-lskey],
-		[AC_MSG_ERROR([liskey missing. You can download S/Key source code from http://rsync1.it.gentoo.org/gentoo/distfiles/skey-1.1.5.tar.bz2])])
+		[AC_MSG_ERROR([libskey missing. You can download S/Key source code from http://rsync1.it.gentoo.org/gentoo/distfiles/skey-1.1.5.tar.bz2])])
 	AC_DEFINE(SKEY, 1, [Define to support S/Key logins.])
 	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 		#include <stdio.h>
diff --git a/lib/cleanup.c b/lib/cleanup.c
index c16f1bcd..4a722212 100644
--- a/lib/cleanup.c
+++ b/lib/cleanup.c
@@ -44,7 +44,7 @@ void do_cleanups (void)
 {
 	unsigned int i;
 
-	/* Make sure there were no overflow */
+	/* Make sure there were no overflows */
 	assert (NULL == cleanup_functions[CLEANUP_FUNCTIONS-1]);
 
 	if (getpid () != cleanup_pid) {
diff --git a/lib/find_new_uid.c b/lib/find_new_uid.c
index abbc8e76..f2ca60ff 100644
--- a/lib/find_new_uid.c
+++ b/lib/find_new_uid.c
@@ -305,7 +305,7 @@ int find_new_uid(bool sys_user,
 				return 0;
 			} else if (result == EEXIST || result == EINVAL) {
 				/*
-				 * This GID is in use or unusable, we'll
+				 * This UID is in use or unusable, we'll
 				 * continue to the next.
 				 */
 			} else {
@@ -351,7 +351,7 @@ int find_new_uid(bool sys_user,
 					return 0;
 				} else if (result == EEXIST || result == EINVAL) {
 					/*
-					 * This GID is in use or unusable, we'll
+					 * This UID is in use or unusable, we'll
 					 * continue to the next.
 					 */
 				} else {
@@ -414,7 +414,7 @@ int find_new_uid(bool sys_user,
 				return 0;
 			} else if (result == EEXIST || result == EINVAL) {
 				/*
-				 * This GID is in use or unusable, we'll
+				 * This UID is in use or unusable, we'll
 				 * continue to the next.
 				 */
 			} else {
@@ -460,7 +460,7 @@ int find_new_uid(bool sys_user,
 					return 0;
 				} else if (result == EEXIST || result == EINVAL) {
 					/*
-					 * This GID is in use or unusable, we'll
+					 * This UID is in use or unusable, we'll
 					 * continue to the next.
 					 */
 				} else {
diff --git a/lib/sgetpwent.c b/lib/sgetpwent.c
index ad9ace3c..20136695 100644
--- a/lib/sgetpwent.c
+++ b/lib/sgetpwent.c
@@ -80,7 +80,7 @@ sgetpwent(const char *buf)
 		return NULL;
 
 	/*
-	 * Each of the fields is converted the appropriate data type
+	 * Each of the fields is converted to the appropriate data type
 	 * and the result assigned to the password structure.  If the
 	 * UID or GID does not convert to an integer value, a NULL
 	 * pointer is returned.
diff --git a/src/chage.c b/src/chage.c
index 409b54a0..79690603 100644
--- a/src/chage.c
+++ b/src/chage.c
@@ -566,7 +566,7 @@ static void open_files (bool readonly)
 	/*
 	 * For shadow password files we have to lock the file and read in
 	 * the entries as was done for the password file. The user entries
-	 * does not have to exist in this case; a new entry will be created
+	 * do not have to exist in this case; a new entry will be created
 	 * for this user if one does not exist already.
 	 */
 	if (!readonly) {
diff --git a/src/groupadd.c b/src/groupadd.c
index d38c4ddf..1623ba80 100644
--- a/src/groupadd.c
+++ b/src/groupadd.c
@@ -480,11 +480,11 @@ static void check_flags (void)
 	check_new_name ();
 
 	/*
-	 * Check if the group already exist.
+	 * Check if the group already exists.
 	 */
 	/* local, no need for xgetgrnam */
 	if (prefix_getgrnam (group_name) != NULL) {
-		/* The group already exist */
+		/* The group already exists */
 		if (fflg) {
 			/* OK, no need to do anything */
 			exit (E_SUCCESS);
@@ -496,7 +496,7 @@ static void check_flags (void)
 	}
 
 	if (gflg && (prefix_getgrgid (group_id) != NULL)) {
-		/* A GID was specified, and a group already exist with that GID
+		/* A GID was specified, and a group already exists with that GID
 		 *  - either we will use this GID anyway (-o)
 		 *  - either we ignore the specified GID and
 		 *    we will use another one (-f)
diff --git a/src/newgidmap.c b/src/newgidmap.c
index 96a89de7..b1bf80e2 100644
--- a/src/newgidmap.c
+++ b/src/newgidmap.c
@@ -177,7 +177,7 @@ int main(int argc, char **argv)
 		if (proc_dir_fd < 0)
 			usage();
 	}
-	/* Who am i? */
+	/* Who am I? */
 	pw = get_my_pwent ();
 	if (NULL == pw) {
 		fprintf (stderr,
diff --git a/src/newgrp.c b/src/newgrp.c
index 88d97758..11fc6f82 100644
--- a/src/newgrp.c
+++ b/src/newgrp.c
@@ -400,7 +400,7 @@ int main (int argc, char **argv)
 
 	/*
 	 * Save my name for error messages and save my real gid in case of
-	 * errors. If there is an error i have to exec a new login shell for
+	 * errors. If there is an error, I have to exec a new login shell for
 	 * the user since her old shell won't have fork'd to create the
 	 * process. Skip over the program name to the next command line
 	 * argument.
@@ -460,7 +460,7 @@ int main (int argc, char **argv)
 	 * for sg causes a command string to be executed.
 	 *
 	 * The next argument, if present, must be the new group name. Any
-	 * remaining remaining arguments will be used to execute a command
+	 * remaining arguments will be used to execute a command
 	 * as the named group. If the group name isn't present, I just use
 	 * the login group ID of the current user.
 	 *
@@ -539,9 +539,9 @@ int main (int argc, char **argv)
 
 #ifdef HAVE_SETGROUPS
 	/*
-	 * get the current users groupset. The new group will be added to
+	 * get the current user's groupset. The new group will be added to
 	 * the concurrent groupset if there is room, otherwise you get a
-	 * nasty message but at least your real and effective group id's are
+	 * nasty message but at least your real and effective group ids are
 	 * set.
 	 */
 	/* don't use getgroups(0, 0) - it doesn't work on some systems */
@@ -576,7 +576,7 @@ int main (int argc, char **argv)
 	 * now we put her in the new group. The password file entry for her
 	 * current user id has been gotten. If there was no optional group
 	 * argument she will have her real and effective group id set to the
-	 * set to the value from her password file entry.
+	 * value from her password file entry.
 	 *
 	 * If run as newgrp, or as sg with no command, this process exec's
 	 * an interactive subshell with the effective GID of the new group.
@@ -677,8 +677,8 @@ int main (int argc, char **argv)
 #ifdef HAVE_SETGROUPS
 	/*
 	 * I am going to try to add her new group id to her concurrent group
-	 * set. If the group id is already present i'll just skip this part.
-	 * If the group doesn't fit, i'll complain loudly and skip this
+	 * set. If the group id is already present I'll just skip this part.
+	 * If the group doesn't fit, I'll complain loudly and skip this
 	 * part.
 	 */
 	for (i = 0; i < ngroups; i++) {
@@ -737,7 +737,7 @@ int main (int argc, char **argv)
 	}
 
 	/*
-	 * See if the "-c" flag was used. If it was, i just create a shell
+	 * See if the "-c" flag was used. If it was, I just create a shell
 	 * command for her using the argument that followed the "-c" flag.
 	 */
 	if (cflag) {
@@ -753,7 +753,7 @@ int main (int argc, char **argv)
 	}
 
 	/*
-	 * I have to get the pathname of her login shell. As a favor, i'll
+	 * I have to get the pathname of her login shell. As a favor, I'll
 	 * try her environment for a $SHELL value first, and then try the
 	 * password file entry. Obviously this shouldn't be in the
 	 * restricted command directory since it could be used to leave the
@@ -785,7 +785,7 @@ int main (int argc, char **argv)
 	progbase = Basename (prog);
 
 	/*
-	 * Switch back to her home directory if i am doing login
+	 * Switch back to her home directory if I am doing login
 	 * initialization.
 	 */
 	if (initflag) {
diff --git a/src/newuidmap.c b/src/newuidmap.c
index e2652b50..8deb06f0 100644
--- a/src/newuidmap.c
+++ b/src/newuidmap.c
@@ -106,7 +106,7 @@ int main(int argc, char **argv)
 			usage();
 	}
 
-	/* Who am i? */
+	/* Who am I? */
 	pw = get_my_pwent ();
 	if (NULL == pw) {
 		fprintf (stderr,
diff --git a/src/usermod.c b/src/usermod.c
index 0f7f1e23..e994132c 100644
--- a/src/usermod.c
+++ b/src/usermod.c
@@ -1803,7 +1803,7 @@ static void move_home (void)
 
 	if (access (prefix_user_newhome, F_OK) == 0) {
 		/*
-		 * If the new home directory already exist, the user
+		 * If the new home directory already exists, the user
 		 * should not use -m.
 		 */
 		fprintf (stderr,