diff --git a/CHANGES b/CHANGES
index 706e5a6..70cf165 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,7 +9,7 @@ corrections:
 
 	fixed lots of weaknesses in test.sh
 
-	corrected some bugs and typos in doc/socat.yo, EXAMPLES
+	corrected some bugs and typos in doc/socat.yo, EXAMPLES, C comments
 
 ####################### V 1.6.0.0:
 
diff --git a/compat.h b/compat.h
index fc8a770..afd3f3c 100644
--- a/compat.h
+++ b/compat.h
@@ -1,13 +1,13 @@
 /* source: compat.h */
-/* Copyright Gerhard Rieger 2001-2006 */
+/* Copyright Gerhard Rieger 2001-2008 */
 /* Published under the GNU General Public License V.2, see file COPYING */
 
 #ifndef __compat_h_included
 #define __compat_h_included 1
 
 /*****************************************************************************/
-/* I dont like this system dependent part, but it would be quit a challenge for
-   configure */
+/* I dont like this system dependent part, but it would be quite a challenge
+   for configure */
 
 /* define if the following does not work:
    socket()
diff --git a/configure.in b/configure.in
index 26bc971..f3161ce 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 nl source: configure.in
-dnl Copyright Gerhard Rieger 2001-2007
+dnl Copyright Gerhard Rieger 2001-2008
 dnl Published under the GNU General Public License V.2, see file COPYING
 
 dnl Process this file with autoconf to produce a configure script.
@@ -1161,7 +1161,7 @@ AC_MSG_RESULT($ac_cv_have_z_modifier)
 
 dnl find the number of bits we must shift a value to match the given mask
 dnl (e.g., mask 0x00f0 requires shifting with 4)
-## NOTE: some platforms only need on '\' to escape '"' in string constant
+## NOTE: some platforms only need one '\' to escape '"' in string constant
 define(AC_SHIFT_OFFSET,[
 AC_CACHE_CHECK(shift offset of $1, $2,
 [LIBS1="$LIBS"; LIBS=""	# avoid libwrap allow_severity undefined
diff --git a/xio-named.c b/xio-named.c
index d337631..892cc96 100644
--- a/xio-named.c
+++ b/xio-named.c
@@ -1,5 +1,5 @@
 /* source: xio-named.c */
-/* Copyright Gerhard Rieger 2001-2007 */
+/* Copyright Gerhard Rieger 2001-2008 */
 /* Published under the GNU General Public License V.2, see file COPYING */
 
 /* this file contains the source for filesystem entry functions */
@@ -22,7 +22,7 @@ const struct optdesc opt_unlink_early= { "unlink-early",NULL, OPT_UNLINK_EARLY,G
 const struct optdesc opt_unlink_late = { "unlink-late", NULL, OPT_UNLINK_LATE, GROUP_NAMED, PH_PASTOPEN, TYPE_BOOL, OFUNC_SPEC };
 const struct optdesc opt_unlink_close  = { "unlink-close", NULL, OPT_UNLINK_CLOSE, GROUP_NAMED, PH_LATE,  TYPE_BOOL, OFUNC_SPEC };
 const struct optdesc opt_umask       = { "umask",       NULL, OPT_UMASK,       GROUP_NAMED, PH_EARLY,  TYPE_MODET, OFUNC_SPEC };
-#endif /* _WITH_NAMED */
+#endif /* WITH_NAMED */
 
 /* applies to fd all options belonging to phase */
 int applyopts_named(const char *filename, struct opt *opts, unsigned int phase) {
@@ -213,4 +213,4 @@ int _xioopen_open(const char *path, int rw, struct opt *opts) {
    return fd;
 }
 
-#endif /* WITH_NAMED */
+#endif /* _WITH_NAMED */
diff --git a/xio-pipe.c b/xio-pipe.c
index 8dcf730..bbe40f6 100644
--- a/xio-pipe.c
+++ b/xio-pipe.c
@@ -1,5 +1,5 @@
 /* source: xio-pipe.c */
-/* Copyright Gerhard Rieger 2001-2007 */
+/* Copyright Gerhard Rieger 2001-2008 */
 /* Published under the GNU General Public License V.2, see file COPYING */
 
 /* this file contains the source for opening addresses of pipe type */
@@ -74,7 +74,7 @@ static int xioopen_fifo_unnamed(xiofile_t *sock, struct opt *opts) {
 }
 
 
-/* open a named pipe/fifo */
+/* open a named or unnamed pipe/fifo */
 static int xioopen_fifo(int argc, const char *argv[], struct opt *opts, int xioflags, xiofile_t *fd, unsigned groups, int dummy1, int dummy2, int dummy3) {
    const char *pipename = argv[1];
    int rw = (xioflags & XIO_ACCMODE);
diff --git a/xioclose.c b/xioclose.c
index cb146b4..850e26f 100644
--- a/xioclose.c
+++ b/xioclose.c
@@ -1,5 +1,5 @@
 /* source: xioclose.c */
-/* Copyright Gerhard Rieger 2001-2007 */
+/* Copyright Gerhard Rieger 2001-2008 */
 /* Published under the GNU General Public License V.2, see file COPYING */
 
 /* this is the source of the extended close function */
@@ -12,7 +12,7 @@
 #include "xio-termios.h"
 
 
-/* close the xio fd; must be valid and "simple" */
+/* close the xio fd; must be valid and "simple" (not dual) */
 int xioclose1(struct single *pipe) {
 
    if (pipe->tag == XIO_TAG_INVALID) {
diff --git a/xioinitialize.c b/xioinitialize.c
index 843340d..81c6a29 100644
--- a/xioinitialize.c
+++ b/xioinitialize.c
@@ -1,5 +1,5 @@
 /* source: xioinitialize.c */
-/* Copyright Gerhard Rieger 2001-2006 */
+/* Copyright Gerhard Rieger 2001-2008 */
 /* Published under the GNU General Public License V.2, see file COPYING */
 
 /* this file contains the source for the initialize function */
@@ -127,8 +127,8 @@ void xiodroplocks(void) {
 /* consider an invokation like this:
    socat -u exec:'some program that accepts data' tcp-l:...,fork
    we do not want the program to be killed by the first tcp-l sub process, it's
-   better if it survives all sub processes. Thus, it must not be killed if the
-   sub process delivers EOF. Also, a socket that is reused in sub processes
+   better if it survives all sub processes. Thus, it must not be killed when
+   the sub process delivers EOF. Also, a socket that is reused in sub processes
    should not be shut down (affects the connection), but closed (affects only
    sub processes copy of file descriptor) */
 static int xio_nokill(xiofile_t *sock) {
diff --git a/xioread.c b/xioread.c
index 74a4ce5..141d7fe 100644
--- a/xioread.c
+++ b/xioread.c
@@ -1,5 +1,5 @@
 /* source: xioread.c */
-/* Copyright Gerhard Rieger 2001-2007 */
+/* Copyright Gerhard Rieger 2001-2008 */
 /* Published under the GNU General Public License V.2, see file COPYING */
 
 /* this is the source of the extended read function */
@@ -142,7 +142,7 @@ ssize_t xioread(xiofile_t *file, void *buff, size_t bufsiz) {
       }
 
       if (pipe->peersa.soa.sa_family != PF_UNSPEC) {
-	 /* a peer address is defined, so we need to check if it matches */
+	 /* a peer address is registered, so we need to check if it matches */
 #if 0 /* with UNIX sockets we find inconsistent lengths */
 	 if (fromlen != pipe->salen) {
 	    Info("recvfrom(): wrong peer address length, ignoring packet");