diff --git a/src/sys/include/net/mem.h b/src/sys/include/net/mem.h
index c8a17eb..342c208 100644
--- a/src/sys/include/net/mem.h
+++ b/src/sys/include/net/mem.h
@@ -71,8 +71,8 @@
 
 
 #define MEM_ALIGN_SIZE(size) (size + \
-                             ((((size) % MEM_ALIGNMENT) == 0)? 0 : \
-                             (MEM_ALIGNMENT - ((size) % MEM_ALIGNMENT))))
+                             ((((size) % (MEM_ALIGNMENT)) == 0)? 0 : \
+                             ((MEM_ALIGNMENT) - ((size) % (MEM_ALIGNMENT)))))
 
 #define MEM_ALIGN(addr) (void *)MEM_ALIGN_SIZE((uInt32)addr)
 
diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h
index 4b38a6b..86c84ec 100644
--- a/src/sys/include/ubixos/init.h
+++ b/src/sys/include/ubixos/init.h
@@ -61,8 +61,8 @@
   pit_init,
   atkbd_init,
   time_init,
-  //net_init,
-  //ne2k_init,
+  net_init,
+  ne2k_init,
   devfs_init,
   pci_init,
   ubixfs_init,
@@ -76,6 +76,9 @@
 
 /***
  $Log$
+ Revision 1.36  2004/09/11 22:17:52  reddawg
+ hmm..
+
  Revision 1.35  2004/09/11 19:15:37  reddawg
  here you go irq 10 io 240 for your ne2k nic
 
diff --git a/src/sys/init/main.c b/src/sys/init/main.c
index b4d4e15..a5dba3a 100644
--- a/src/sys/init/main.c
+++ b/src/sys/init/main.c
@@ -109,16 +109,19 @@
   /* initHardDisk(); */
   
   /* Initialize the system */
+  //kprintf("0");
   execThread(systemTask,(kmalloc(0x2000)+0x2000),0x0);
-
+  //kprintf("1");
   execFile("sys:/init",0x0,0x0,0x1);
   
   /*
   execFile("sys:/login",0x0,0x0,0x1);
   */
-  
+  //kprintf("2");
   execFile("sys:/login",0x0,0x0,0x2);
+  //kprintf("3");
   execFile("sys:/login",0x0,0x0,0x3);
+  //kprintf("4");
   execFile("sys:/login",0x0,0x0,0x4);
 
   kprintf("Free Pages: [%i]\n",systemVitals->freePages); 
@@ -134,6 +137,9 @@
 
 /***
  $Log$
+ Revision 1.84  2004/09/11 12:26:07  reddawg
+ We now initialize all needed daemons
+
  Revision 1.83  2004/09/11 12:11:11  reddawg
  Cleaning up the VFS more changes to follow...
 
diff --git a/src/sys/kernel/exec.c b/src/sys/kernel/exec.c
index 9a5abb4..4406c48 100644
--- a/src/sys/kernel/exec.c
+++ b/src/sys/kernel/exec.c
@@ -175,7 +175,9 @@
 
   /* Load ELF Header */
   binaryHeader = (elfHeader *)kmalloc(sizeof(elfHeader));
+  //kprintf(">a:%i:0x%X:0x%X<",sizeof(elfHeader),binaryHeader,tmpFd);
   fread(binaryHeader,sizeof(elfHeader),1,tmpFd);
+  //kprintf(">b<");
 
   /* Check If App Is A Real Application */
   if ((binaryHeader->eIdent[1] != 'E') && (binaryHeader->eIdent[2] != 'L') && (binaryHeader->eIdent[3] != 'F')) {
@@ -200,7 +202,9 @@
   /* Load The Program Header(s) */
   programHeader = (elfProgramHeader *)kmalloc(sizeof(elfProgramHeader)*binaryHeader->ePhnum);
   fseek(tmpFd,binaryHeader->ePhoff,0);
+  //kprintf(">c:%i:0x%X:0x%X<",sizeof(elfProgramHeader)*binaryHeader->ePhnum,programHeader,tmpFd);
   fread(programHeader,(sizeof(elfProgramHeader)*binaryHeader->ePhnum),1,tmpFd);
+  //kprintf(">d<");
 
   /* Loop Through The Header And Load Sections Which Need To Be Loaded */
   for (i=0;i<binaryHeader->ePhnum;i++) {
@@ -321,8 +325,9 @@
 
   if ((binaryHeader = (elfHeader *)kmalloc(sizeof(elfHeader))) == 0x0) 
     endTask(_current->id);
-
+  //kprintf("A");
   fread(binaryHeader,sizeof(elfHeader),1,tmpFd);
+  //kprintf("B");
   /* Set sectionHeader To Point To Loaded Binary To We Can Gather Info */
 
   /* Check If App Is A Real Application */
@@ -425,6 +430,9 @@
 
 /***
  $Log$
+ Revision 1.73  2004/09/11 14:23:34  reddawg
+ ok
+
  Revision 1.72  2004/09/07 21:54:38  reddawg
  ok reverted back to old scheduling for now....
 
diff --git a/src/sys/lib/kmalloc.c b/src/sys/lib/kmalloc.c
index 6272413..c3d0111 100644
--- a/src/sys/lib/kmalloc.c
+++ b/src/sys/lib/kmalloc.c
@@ -123,7 +123,7 @@
 
 ************************************************************************/
 static int insertFreeDesc(struct memDescriptor *freeDesc) {
-  
+  struct memDescriptor *tmpDesc = 0x0;
   assert(freeDesc);
   
   if (freeDesc->limit <= 0x0)
@@ -136,7 +136,7 @@
     freeKernDesc->prev = freeDesc;
     freeKernDesc = freeDesc;
 
-    /*
+    #if 0
     for (tmpDesc = freeKernDesc;tmpDesc != 0x0;tmpDesc = tmpDesc->next) {
       if (freeDesc->limit <= tmpDesc->limit) {
         freeDesc->prev = tmpDesc->prev;
@@ -155,7 +155,7 @@
          }
       }
     kpanic("didnt Insert\n");
-    */
+    #endif
     return(0x0);
     }
   else {
@@ -178,7 +178,6 @@
 03/05/03 - We Have A Problem It Seems The First Block Is Limit 0x0
 
 ************************************************************************/
-#if 0
 static void mergeMemBlocks() {
   struct memDescriptor *tmpDesc1 = 0x0;
   struct memDescriptor *tmpDesc2 = 0x0;
@@ -229,7 +228,6 @@
     }
   return;
   }
-#endif
 
 
 /************************************************************************
@@ -288,6 +286,7 @@
         (char)buf[i] = (char)0x0;
         }
       spinUnlock(&mallocSpinLock);
+      //kprintf("m1[%i:%i:0x%X]",tmpDesc1->limit,len,tmpDesc1->baseAddr);
       return(tmpDesc1->baseAddr);
       }
     }
@@ -321,6 +320,7 @@
         }
     spinUnlock(&mallocSpinLock);
     //kprintf("baseAddr2[0x%X:0x%X]",tmpDesc1,tmpDesc1->baseAddr);
+    //kprintf("m2[%i:%i:0x%X]",tmpDesc1->limit,len,tmpDesc1->baseAddr);
     return(tmpDesc1->baseAddr);
     }
   //Return Null If Unable To Malloc
@@ -368,9 +368,10 @@
       
       if (tmpDesc->limit <= 0x0)
         kprintf("kfree tmpDesc1: [%i]\n",tmpDesc->limit);
+      //kprintf("{0x%X}",tmpDesc->baseAddr);
       insertFreeDesc(tmpDesc);
 
-      //mergeMemBlocks();
+     // mergeMemBlocks();
       spinUnlock(&mallocSpinLock);
       return;
       }
@@ -382,6 +383,9 @@
 
 /***
  $Log$
+ Revision 1.29  2004/09/11 23:39:31  reddawg
+ ok time for bed
+
  Revision 1.28  2004/09/11 23:21:26  reddawg
  run now do you get fegfaults with BB?
 
diff --git a/src/sys/vfs/file.c b/src/sys/vfs/file.c
index 1e9e400..0dccbf2 100644
--- a/src/sys/vfs/file.c
+++ b/src/sys/vfs/file.c
@@ -144,8 +144,9 @@
   	return;
   if (userFd->fd == NULL)
   	return;
-	
+  //kprintf("X");
   fread(data,size,1,userFd->fd);
+  //kprintf("Y");
   /* Return */
   return;
   }
@@ -484,6 +485,9 @@
 
 /***
  $Log$
+ Revision 1.24  2004/09/11 13:12:56  reddawg
+ Removed kernel/file.c all in the vfs now
+
  Revision 1.23  2004/09/11 12:59:21  apwillia
  Fixed file syscalls so fdisk does not kernel panic