diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h
index 53aeaab..5d4415a 100644
--- a/src/sys/include/ubixos/init.h
+++ b/src/sys/include/ubixos/init.h
@@ -61,10 +61,8 @@
   pit_init,
   atkbd_init,
   time_init,
-  /*
   net_init,
   ne2k_init,
-  */
   devfs_init,
   pci_init,
   ubixfs_init,
@@ -78,6 +76,9 @@
 
 /***
  $Log$
+ Revision 1.38  2004/09/16 22:35:27  reddawg
+ Demo Release
+
  Revision 1.37  2004/09/14 21:51:24  reddawg
  Debug info
 
diff --git a/src/sys/kernel/endtask.c b/src/sys/kernel/endtask.c
index 3627fcd..84f5ebf 100644
--- a/src/sys/kernel/endtask.c
+++ b/src/sys/kernel/endtask.c
@@ -49,7 +49,6 @@
   /* Don't mess with scheduler structures from outside the scheduler! */
   /* Just set status to dead, and let the scheduler clean up itself */
   sched_setStatus(pid,DEAD);
-  
   //tmpTask = schedFindTask(pid);
   //if (sched_deleteTask(pid) != 0x0)
   //  kpanic("sched_deleteTask: Failed\n");
@@ -68,6 +67,9 @@
 
 /***
  $Log$
+ Revision 1.24  2004/09/11 21:45:51  apwillia
+ Make endtask loop forever if _current->id == pid
+
  Revision 1.23  2004/09/11 17:39:51  apwillia
  CHRIS: Don't mess with scheduler structures outside the schedulergvim endtask.c  Finally fixed the race condition.
 
diff --git a/src/sys/kernel/sched.c b/src/sys/kernel/sched.c
index 5c06d9b..95a7529 100644
--- a/src/sys/kernel/sched.c
+++ b/src/sys/kernel/sched.c
@@ -98,7 +98,7 @@
         _current->state = READY;
       break;
       }
-    else if (_current->state == DEAD)
+    else if (tmpTask->state == DEAD)
       {
         delTask  = tmpTask;
         tmpTask  = tmpTask->next;
@@ -277,6 +277,9 @@
 
 /***
  $Log$
+ Revision 1.62  2004/09/16 22:35:28  reddawg
+ Demo Release
+
  Revision 1.61  2004/09/15 21:25:33  reddawg
  Fixens
 
diff --git a/src/sys/kernel/systemtask.c b/src/sys/kernel/systemtask.c
index b267d1d..031588e 100644
--- a/src/sys/kernel/systemtask.c
+++ b/src/sys/kernel/systemtask.c
@@ -93,15 +93,14 @@
           break;
         }
       }
-    tmpTask = sched_getDelTask();
+    tmpTask = sched_getDelTask();    
     if (tmpTask != 0x0) {
-      //kprintf("Deleting Task: %i\n",tmpTask->id);
       vmmFreeProcessPages(tmpTask->id);
       
 
       if (tmpTask->imageFd != 0x0)
         fclose(tmpTask->imageFd);
-	
+
       kfree(tmpTask);
       }
       
@@ -113,6 +112,9 @@
 
 /***
  $Log$
+ Revision 1.25  2004/09/11 22:21:11  reddawg
+ oInfo.cwd is now an array no longer a pointer..
+
  Revision 1.24  2004/09/11 22:17:52  reddawg
  hmm..
 
diff --git a/src/sys/net/net/shell.c b/src/sys/net/net/shell.c
index 70503b3..4c73f9c 100644
--- a/src/sys/net/net/shell.c
+++ b/src/sys/net/net/shell.c
@@ -82,7 +82,10 @@
         break;
 	}
       else if (!strcmp(buffer,"ls")) {
-        sendstr("no\nfucken\nfiles\here\n", conn);
+        sendstr("no\nfiles\nhere\n", conn);
+	}
+      else if (!strcmp(buffer,"uname")) {
+        sendstr("UbixOS v1.0 reddawg@devel.ubixos.com:/ubix.elf\n",conn);
 	}
       prompt(conn);
       }