diff --git a/Makefile b/Makefile
index 07e78a8..dc2396a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # $Id$
 # The System Makefile (C) 2002 The UbixOS Project
 
-all: kernel libc ubix objgfx40 libcpp libstdc++ views bin tools
+all: kernel libc ubix libcpp bin tools
 # depend kernel tools
 
 libc: src
diff --git a/src/Makefile.inc b/src/Makefile.inc
index 935fc6c..8a14d34 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -2,8 +2,8 @@
 # Global 'Source' Options
 
 # allow you to change your default compiler without affecting your other work
-CC = gcc
-CXX = g++
+CC = gcc295
+CXX = g++295
 LD = ld
 AR = ar
 REMOVE = rm -rf
diff --git a/src/lib/libc_old/math/Makefile b/src/lib/libc_old/math/Makefile
index 1b73391..8fe19f8 100644
--- a/src/lib/libc_old/math/Makefile
+++ b/src/lib/libc_old/math/Makefile
@@ -21,7 +21,7 @@
 	$(CXX) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
  
 .c.o:
-	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../include -c $<
+	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../../../include -c $<
 
 .c.s:
 	$(CC) $(CFLAGS) -Wall -nostdlib -O -I../include -S -o $@ $<
diff --git a/src/lib/libcpp/Makefile b/src/lib/libcpp/Makefile
index 186fcbf..5aa87df 100644
--- a/src/lib/libcpp/Makefile
+++ b/src/lib/libcpp/Makefile
@@ -9,7 +9,7 @@
 
 #Include
 
-INCLUDE = -I./include -I../libc/include
+INCLUDE = -I../../include -I./include -I../libc/include
 
 all: $(OBJS)
 
diff --git a/src/sys/init/main.c b/src/sys/init/main.c
index 58a1e70..0e9a764 100644
--- a/src/sys/init/main.c
+++ b/src/sys/init/main.c
@@ -82,7 +82,7 @@
  Notes: 
 
 *****************************************************************************************/
-int main(int argc,char **argv) {
+int main() {
 
   clearScreen(); /* Do A Clear Screen Just To Make The TEXT Buffer Nice And Empty */
   //smpInit();     /* Initialize SMP */
@@ -173,7 +173,6 @@
   kprintf("Free Pages: [%i]\n",freePages); 
   kprintf("MemoryMap:  [0x%X]\n",vmmMemoryMap);
   kprintf("Starting Os\n");
-  kprintf("argc: %i:%s\n",argc,argv[0]);
   irqEnable(0x0);
   sched();
   return(0x0);
@@ -195,11 +194,7 @@
            At A Later Date Then Reboot The Machine
 
 ************************************************************************/
-void _start(char *args, ...) {
-  int    argc;
-  char **argv;
-  argv = &args;
-  argc = * (int *) (argv - 1);
+void _start() {
   asm ("pushl $2; popf");
   asm volatile(
     "lgdtl (loadGDT)        \n"
@@ -221,13 +216,16 @@
     : "r" (ubixGDT), "p" (kernelStack+8192)
     : "%eax"
     );
-  main(argc,argv);
+  main();
   kpanic("Error: kernel main returned.\n");
   }
 
 /***
 
  $Log$
+ Revision 1.33  2004/06/25 13:16:23  reddawg
+ Made kernel stack static to prevent corruptions
+
  Revision 1.32  2004/06/04 17:33:33  reddawg
  Changed idle task to system task
 
diff --git a/src/sys/kernel/endtask.c b/src/sys/kernel/endtask.c
index c6f86af..6122013 100644
--- a/src/sys/kernel/endtask.c
+++ b/src/sys/kernel/endtask.c
@@ -29,10 +29,14 @@
 
 #include <ubixos/types.h>
 #include <ubixos/sched.h>
+#include <ubixos/vitals.h>
 #include <vmm/vmm.h>
+#include <lib/kprintf.h>
 
 void endTask(pidType pid) {
+  kprintf("Ending Task: [%i:%i:%i]\n",pid,_current->id,systemVitals->freePages);
   vmmFreeProcessPages(pid);
+  kprintf("Ending Task: [%i:%i:%i]\n",pid,_current->id,systemVitals->freePages);
   _current->state = DEAD;
   schedYield(); /* I'm pretty sure we need this if the thread is ending itself */
   return;
@@ -40,6 +44,9 @@
 
 /***
  $Log$
+ Revision 1.3  2004/06/15 12:24:07  reddawg
+ Cleaned Up
+
  Revision 1.2  2004/05/21 15:49:13  reddawg
  The os does better housekeeping now when a task is exited
 
diff --git a/src/sys/kernel/systemtask.c b/src/sys/kernel/systemtask.c
index 96252ef..95d5196 100644
--- a/src/sys/kernel/systemtask.c
+++ b/src/sys/kernel/systemtask.c
@@ -68,6 +68,9 @@
              kprintf("Starting SDE\n");
              execThread(sdeThread,(uInt32)(kmalloc(0x2000)+0x2000),0x0);
              }
+           else if (!kstrcmp(myMsg.data,"freePage")) {
+             kprintf("Free Page: %i\n",systemVitals->freePages);
+             }
            break;
         default:
           kprintf("system: Received message %i:%s\n",myMsg.type,myMsg.data);
@@ -81,6 +84,9 @@
 
 /***
  $Log$
+ Revision 1.1  2004/06/04 17:33:33  reddawg
+ Changed idle task to system task
+
  Revision 1.9  2004/06/04 13:29:56  reddawg
  libc: modified mkdir(); interface
  kpanic: kPanic(); now says kPanic: %s