diff --git a/src/sys/include/ubixos/endtask.h b/src/sys/include/ubixos/endtask.h
index 1b50963..da8b813 100644
--- a/src/sys/include/ubixos/endtask.h
+++ b/src/sys/include/ubixos/endtask.h
@@ -31,13 +31,18 @@
 #define _ENDTASK_H
 
 #include <ubixos/types.h>
+#include <ubixos/sched.h>
 
-void EndTask(pidType pid);
+void endTask(pidType);
+void endTask2(kTask_t *);
 
 #endif
 
 /***
  $Log$
+ Revision 1.3  2005/08/08 21:33:44  fsdfs
+ new scheduler!
+
  Revision 1.2  2004/05/21 15:20:00  reddawg
  Cleaned up
 
diff --git a/src/sys/include/ubixos/sched.h b/src/sys/include/ubixos/sched.h
index 7470b86..31f4e6d 100644
--- a/src/sys/include/ubixos/sched.h
+++ b/src/sys/include/ubixos/sched.h
@@ -33,7 +33,6 @@
 #include <ubixos/types.h>
 #include <ubixos/elf.h>
 #include <ubixos/tty.h>
-#include <ubixos/endtask.h>
 #include <vfs/file.h>
 #include <sys/tss.h>
 
@@ -94,6 +93,9 @@
 kTask_t *schedNewTask();
 kTask_t *schedFindTask(uInt32 id);
 
+int sched_deleteTask(pidType);
+int  sched_addDelTask(kTask_t *);
+
 extern kTask_t *_current;
 extern kTask_t *_usedMath;
 
diff --git a/src/sys/kernel/endtask.c b/src/sys/kernel/endtask.c
index cab93f9..4327e61 100644
--- a/src/sys/kernel/endtask.c
+++ b/src/sys/kernel/endtask.c
@@ -52,7 +52,7 @@
 /* this function is much faster if you have the kTask_t item at hand */
 void endTask2(kTask_t *task)
 {
-        sched_setStatus(task, DEAD); /* fsdfs */
+        sched_setStatus(task->id, DEAD); /* fsdfs */
 
         return;
 }
diff --git a/src/sys/kernel/kpanic.c b/src/sys/kernel/kpanic.c
index 0b521f4..7ba0d25 100644
--- a/src/sys/kernel/kpanic.c
+++ b/src/sys/kernel/kpanic.c
@@ -29,6 +29,7 @@
 
 #include <ubixos/kpanic.h>
 #include <sys/video.h>
+#include <isa/8259.h>
 #include <lib/kprintf.h>
 #include <stdarg.h>
 
diff --git a/src/sys/kernel/systemtask.c b/src/sys/kernel/systemtask.c
index c551da4..d446cf2 100644
--- a/src/sys/kernel/systemtask.c
+++ b/src/sys/kernel/systemtask.c
@@ -47,7 +47,6 @@
   uInt32       counter  = 0x0;
   int          i        = 0x0;
   int          *x       = 0x0;
-  kTask_t      *tmpTask = 0x0;
 
   if (mpi_createMbox("system") != 0x0) {
     kpanic("Error: Error creating mailbox: system\n");
diff --git a/src/sys/kernel/ubthread.c b/src/sys/kernel/ubthread.c
index b96a52e..3279a9f 100644
--- a/src/sys/kernel/ubthread.c
+++ b/src/sys/kernel/ubthread.c
@@ -76,7 +76,7 @@
 
 int ubthread_create(kTask_t **thread,const uInt32 *attr,void (* tproc)(void), void *arg) {
 
-  *thread = (void *)execThread(tproc,(kmalloc(0x2000)+0x2000),arg);
+  *thread = (void *)execThread(tproc,(uInt32)(kmalloc(0x2000)+0x2000),arg);
   return(0x0);
   }