Index: generic/nsf.c
===================================================================
diff -u -r03990ee9d7185ded72b0fa05e81f848e866451c2 -r307d8d07b77b9f393414f8f521675361db2ac2bd
--- generic/nsf.c	(.../nsf.c)	(revision 03990ee9d7185ded72b0fa05e81f848e866451c2)
+++ generic/nsf.c	(.../nsf.c)	(revision 307d8d07b77b9f393414f8f521675361db2ac2bd)
@@ -5203,7 +5203,10 @@
     return TCL_ERROR;
   }
 
-  /* we have no baseclass, we have to pass NULL as last argument */
+  /* 
+   * Since we do not know the baseclass, we have to pass NULL as last
+   * argument.
+   */
   if (GetClassFromObj(interp, nameObj, &mixin, NULL) != TCL_OK) {
     return NsfObjErrType(interp, "mixin", nameObj, "a class as mixin", NULL);
   }
Index: generic/nsfUtil.c
===================================================================
diff -u -reea1c3907d9df65b1e1f80a0d19df35a5dc33d50 -r307d8d07b77b9f393414f8f521675361db2ac2bd
--- generic/nsfUtil.c	(.../nsfUtil.c)	(revision eea1c3907d9df65b1e1f80a0d19df35a5dc33d50)
+++ generic/nsfUtil.c	(.../nsfUtil.c)	(revision 307d8d07b77b9f393414f8f521675361db2ac2bd)
@@ -13,6 +13,61 @@
 
 #include "nsfInt.h"
 
+/*
+ *----------------------------------------------------------------------
+ * strnstr --
+ *
+ *    Implementation of strnstr() for platforms not providing it via their C
+ *    library. The function strnstr locates the first occurance of a substring
+ *    in a null-terminated string
+ *
+ * Results:
+ *    Strbstring or NULL
+ *
+ * Side effects:
+ *    None.
+ *
+ *----------------------------------------------------------------------
+ */
+#ifndef HAVE_STRNSTR
+char *strnstr(const char *buffer, const char *needle, size_t buffer_len) {
+  char *p;
+  size_t remainder, needle_len;
+
+  if (*needle == '\0') {
+    return (char *)buffer;
+  }
+
+  needle_len = strlen(needle);
+  for (p = (char *)buffer, remainder = buffer_len; 
+       p != NULL; 
+       p = memchr(p + 1, *needle, remainder-1)) {
+    remainder = buffer_len - (p - buffer);
+    if (remainder < needle_len) break;
+    if (strncmp(p, needle, needle_len) == 0) {
+      return p;
+    }
+  }
+
+  return NULL;
+}
+#endif
+
+/*
+ *----------------------------------------------------------------------
+ * Nsf_ltoa --
+ *
+ *    Convert a long value into a string; this function is a fast 
+ *    version of sprintf(buf,"%ld",l);
+ *
+ * Results:
+ *    String containing decimal value of the provided parameter.
+ *
+ * Side effects:
+ *    None.
+ *
+ *----------------------------------------------------------------------
+ */
 char *
 Nsf_ltoa(char *buf, long i, int *len)  /* fast version of sprintf(buf,"%ld",l); */ {
   int nr_written, negative;
@@ -40,6 +95,21 @@
   return string;
 }
 
+/*
+ *----------------------------------------------------------------------
+ * NsfStringIncr --
+ *
+ *    Increment a value on a number system with the provided alphabet. The
+ *    intention of the function is to generate compact new symbols.
+ *
+ * Results:
+ *    New symbol in form of a string.
+ *
+ * Side effects:
+ *    None.
+ *
+ *----------------------------------------------------------------------
+ */
 
 static char *alphabet = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
 static int blockIncrement = 8;
@@ -49,7 +119,6 @@
 */
 static unsigned char chartable[255] = {0};
 
-
 char *
 NsfStringIncr(NsfStringIncrStruct *iss) {
   char newch, *currentChar;
@@ -94,6 +163,22 @@
   return iss->start;
 }
 
+/*
+ *----------------------------------------------------------------------
+ * NsfStringIncrInit, NsfStringIncrFree --
+ *
+ *    Support function for NsfStringIncr(). NsfStringIncrInit() function is
+ *    called before NsfStringIncr() can be used on this buffer,
+ *    NsfStringIncrFree() terminates usage.
+ *
+ * Results:
+ *    void
+ *
+ * Side effects:
+ *    Initializes the .
+ *
+ *----------------------------------------------------------------------
+ */
 
 void
 NsfStringIncrInit(NsfStringIncrStruct *iss) {
@@ -124,30 +209,8 @@
 }
 
 
-#ifndef HAVE_STRNSTR
-char *strnstr(const char *buffer, const char *needle, size_t buffer_len) {
-  char *p;
-  size_t remainder, needle_len;
 
-  if (*needle == '\0') {
-    return (char *)buffer;
-  }
 
-  needle_len = strlen(needle);
-  for (p = (char *)buffer, remainder = buffer_len; 
-       p != NULL; 
-       p = memchr(p + 1, *needle, remainder-1)) {
-    remainder = buffer_len - (p - buffer);
-    if (remainder < needle_len) break;
-    if (strncmp(p, needle, needle_len) == 0) {
-      return p;
-    }
-  }
-
-  return NULL;
-}
-#endif
-
 /*
  * Local Variables:
  * mode: c