Index: /branches/eam_branches/ipp-20110906/Ohana/src/libohana/include/ohana.h
===================================================================
--- /branches/eam_branches/ipp-20110906/Ohana/src/libohana/include/ohana.h	(revision 32607)
+++ /branches/eam_branches/ipp-20110906/Ohana/src/libohana/include/ohana.h	(revision 32608)
@@ -20,5 +20,5 @@
 
 // comment this out to avoid the internal Ohana memory management code
-// # define OHANA_MEMORY
+# define OHANA_MEMORY
 
 // XXX I was including these before, but RHL claims they are not needed
Index: /branches/eam_branches/ipp-20110906/Ohana/src/libohana/src/ohana_allocate.c
===================================================================
--- /branches/eam_branches/ipp-20110906/Ohana/src/libohana/src/ohana_allocate.c	(revision 32607)
+++ /branches/eam_branches/ipp-20110906/Ohana/src/libohana/src/ohana_allocate.c	(revision 32608)
@@ -112,4 +112,7 @@
   // memblock of supplied pointer
   old = (Memblock *) in - 1;
+
+  if (old->startblock != OHANA_MEMMAGIC) ohana_memabort ("corrupt memory (%s, %d, %s)\n", file, line, func);
+  if (old->endblock != OHANA_MEMMAGIC) ohana_memabort ("corrupt memory (%s, %d, %s)\n", file, line, func);
 
   Nelem = MAX (1, Nelem);
Index: /branches/eam_branches/ipp-20110906/Ohana/src/opihi/cmd.astro/ringflux.c
===================================================================
--- /branches/eam_branches/ipp-20110906/Ohana/src/opihi/cmd.astro/ringflux.c	(revision 32607)
+++ /branches/eam_branches/ipp-20110906/Ohana/src/opihi/cmd.astro/ringflux.c	(revision 32608)
@@ -62,4 +62,5 @@
       }
       if (Nvec >= vec[0].Nelements - 8) {
+	  // counting error here
 	ResetVector (vec, OPIHI_FLT, vec[0].Nelements + 64);
       }
Index: /branches/eam_branches/ipp-20110906/Ohana/src/opihi/cmd.data/vstats.c
===================================================================
--- /branches/eam_branches/ipp-20110906/Ohana/src/opihi/cmd.data/vstats.c	(revision 32607)
+++ /branches/eam_branches/ipp-20110906/Ohana/src/opihi/cmd.data/vstats.c	(revision 32608)
@@ -208,4 +208,5 @@
 skip:
   FREE(mask);
+  if (mask) mask = NULL;
 
   if (!Quiet) {
Index: /branches/eam_branches/ipp-20110906/Ohana/src/opihi/pantasks/init_server.c
===================================================================
--- /branches/eam_branches/ipp-20110906/Ohana/src/opihi/pantasks/init_server.c	(revision 32607)
+++ /branches/eam_branches/ipp-20110906/Ohana/src/opihi/pantasks/init_server.c	(revision 32608)
@@ -4,4 +4,5 @@
 int task            PROTO((int, char **));
 int task_host       PROTO((int, char **));
+int task_nice       PROTO((int, char **));
 int task_nmax       PROTO((int, char **));
 int task_npending   PROTO((int, char **));