--- a/src/os/heap.c	Wed Nov 02 21:42:28 2011 -0400
+++ b/src/os/heap.c	Fri Nov 04 14:29:16 2011 -0400
@@ -3,6 +3,8 @@
 #include <os/storageKeys.h>
 #include <os/memLayout.h>
 
+//TODO break if PageSize%BLOCKSIZE != 0
+
 static Header base;
 static Header *allocp = NULL;
 
@@ -35,7 +37,7 @@
 			*ammt = cur->size*PageSize - sizeof(Header);
 			allocp = prev;
 			intptr_t ptr;
-			for(ptr = (intptr_t)cur; (ptr - (intptr_t)cur)/BLOCKSIZE < nUnits; ptr += PageSize) {
+			for(ptr = (intptr_t)cur; (ptr - (intptr_t)cur) < nUnits*PageSize; ptr += BLOCKSIZE) {
 				setStorageKey(ptr, PROGSK, 1); //TODO only do this if being called by the program (how?)
 			}
 			return (void*)(cur + 1);
@@ -48,6 +50,10 @@
 void freeHeap(void *ptr)
 {
 	Header *toFree = (Header *)ptr - 1;
+	intptr_t skLoc;
+	for(skLoc = (intptr_t)toFree; (skLoc - (intptr_t)toFree) < toFree->size*PageSize; skLoc += BLOCKSIZE) {
+		setStorageKey(skLoc, 0, 1);
+	}
 	Header *scan;
 	for(scan = allocp; !(toFree > scan && toFree < scan->next); scan = scan->next)
 		if(scan->next <= scan && (toFree > scan || toFree < scan->next)) break;