Index: TODO
===================================================================
diff -u -r6889109b1238e52796b59d0f35b81e00f9f268cf -r3ea11774a1d822bb63611f31ec092db6b4853c4e
--- TODO	(.../TODO)	(revision 6889109b1238e52796b59d0f35b81e00f9f268cf)
+++ TODO	(.../TODO)	(revision 3ea11774a1d822bb63611f31ec092db6b4853c4e)
@@ -3016,7 +3016,7 @@
    * provided flags to VarExists instead of multiple args
    * don't add new pointer entries in Nsf_PointerTypeLookup()
 
-- preliminary fix for volatile called through redsidual args
+- preliminary fix for volatile called through residual args
 - new regression test file volatile.test
 
 - fix the comparison with "unknown" in residual args 
@@ -3096,9 +3096,9 @@
   * extended regression test
 
 - nsf.c:
-   * fixing compliation with NSF_MEM_COUNT
+   * fixing compilation with NSF_MEM_COUNT
    * New function DeleteProcsAndVars() to trigger deletion of
-     ParamDefs (fixes a small mmemory leak);
+     ParamDefs (fixes a small memory leak);
    * improved comments
     
 
Index: generic/nsf.c
===================================================================
diff -u -r6889109b1238e52796b59d0f35b81e00f9f268cf -r3ea11774a1d822bb63611f31ec092db6b4853c4e
--- generic/nsf.c	(.../nsf.c)	(revision 6889109b1238e52796b59d0f35b81e00f9f268cf)
+++ generic/nsf.c	(.../nsf.c)	(revision 3ea11774a1d822bb63611f31ec092db6b4853c4e)
@@ -11280,7 +11280,7 @@
   if (tcd->onerror)     {DECR_REF_COUNT(tcd->onerror);}
   if (tcd->prefix)      {DECR_REF_COUNT(tcd->prefix);}
   if (tcd->args)        {DECR_REF_COUNT(tcd->args);}
-  FREE(forwardCmdClientData, tcd);
+  FREE(ForwardCmdClientData, tcd);
 }
 
 
@@ -11435,7 +11435,7 @@
                        Tcl_Obj *withDefault, int withEarlybinding, Tcl_Obj *withMethodprefix,
                        int withObjframe, Tcl_Obj *withOnerror, int withVerbose,
                        Tcl_Obj *target, int objc, Tcl_Obj * CONST objv[],
-                       ForwardCmdClientData **tcdp) {
+                       ForwardCmdClientData **tcdPtr) {
   ForwardCmdClientData *tcd;
   int i, result = 0;
 
@@ -11530,7 +11530,7 @@
  forward_process_options_exit:
   /*fprintf(stderr, "forward args = %p, name = '%s'\n", tcd->args, ObjStr(tcd->cmdName));*/
   if (result == TCL_OK) {
-    *tcdp = tcd;
+    *tcdPtr = tcd;
   } else {
     ForwardCmdDeleteProc(tcd);
   }
Index: generic/nsfTrace.c
===================================================================
diff -u -r6889109b1238e52796b59d0f35b81e00f9f268cf -r3ea11774a1d822bb63611f31ec092db6b4853c4e
--- generic/nsfTrace.c	(.../nsfTrace.c)	(revision 6889109b1238e52796b59d0f35b81e00f9f268cf)
+++ generic/nsfTrace.c	(.../nsfTrace.c)	(revision 3ea11774a1d822bb63611f31ec092db6b4853c4e)
@@ -109,7 +109,8 @@
 
   hPtr = Tcl_FindHashEntry(table, id);
   if (!hPtr) {
-    fprintf(stderr, "******** MEM COUNT ALERT: Trying to free <%s>, but was not allocated\n", id);
+    fprintf(stderr, "******** MEM COUNT ALERT: Trying to free %p <%s>, "
+	    "but was not allocated\n", p, id);
     return;
   }
   entry = (NsfMemCounter *)Tcl_GetHashValue(hPtr);