diff --git a/src/sys/isa/atkbd.c b/src/sys/isa/atkbd.c
index 2cc9044..ca9c268 100644
--- a/src/sys/isa/atkbd.c
+++ b/src/sys/isa/atkbd.c
@@ -271,6 +271,7 @@
         //if (tty_foreground != 0x0)
         //  endTask(tty_foreground->owner);
         //kprintf("CTRL-C pressed\n");
+        kprintf("FreePages: [0x%X]\n",systemVitals->freePages);
         break;
       default:
         if (tty_foreground == 0x0) {
@@ -339,6 +340,9 @@
 /***
 
  $Log$
+ Revision 1.28  2004/09/08 23:19:58  reddawg
+ hmm
+
  Revision 1.27  2004/09/07 21:54:38  reddawg
  ok reverted back to old scheduling for now....
 
diff --git a/src/sys/kernel/sched.c b/src/sys/kernel/sched.c
index ec55bee..97499d5 100644
--- a/src/sys/kernel/sched.c
+++ b/src/sys/kernel/sched.c
@@ -96,10 +96,12 @@
         _current->state = READY;
       break;
       }
-    else if (_current->state == DEAD) {
-      sched_deleteTask(_current->id);
-      sched_addDelTask(_current->id);
-      continue;
+    else if (_current->state == DEAD)
+      {
+        _current = tmpTask;
+        tmpTask  = tmpTask->prev;
+        sched_deleteTask(_current->id);
+        sched_addDelTask(_current);
       }
     }
 
@@ -274,6 +276,9 @@
 
 /***
  $Log$
+ Revision 1.56  2004/09/11 21:31:54  apwillia
+ Fix DEAD problem
+
  Revision 1.55  2004/09/11 21:30:37  apwillia
  Fix race conditions in net thread and scheduler
 
diff --git a/src/sys/kernel/systemtask.c b/src/sys/kernel/systemtask.c
index 6f9b370..455449e 100644
--- a/src/sys/kernel/systemtask.c
+++ b/src/sys/kernel/systemtask.c
@@ -98,11 +98,13 @@
       //kprintf("Deleting Task: %i\n",tmpTask->id);
       vmmFreeProcessPages(tmpTask->id);
       
-  
+
       if (tmpTask->imageFd != 0x0)
         fclose(tmpTask->imageFd);
-      
-      kfree(tmpTask->oInfo.cwd);
+
+      if (tmpTask->oInfo.cwd != 0x0)
+        kfree(tmpTask->oInfo.cwd);
+
       kfree(tmpTask);
       }
       
@@ -114,6 +116,9 @@
 
 /***
  $Log$
+ Revision 1.22  2004/09/11 14:23:34  reddawg
+ ok
+
  Revision 1.21  2004/09/08 23:19:58  reddawg
  hmm