diff --git a/c_os/devices/CGA_Stream.h b/c_os/devices/CGA_Stream.h
index c3fb5dc..97675bb 100755
--- a/c_os/devices/CGA_Stream.h
+++ b/c_os/devices/CGA_Stream.h
@@ -15,7 +15,8 @@
 #ifndef __CGA_Stream_include__
 #define __CGA_Stream_include__
 
-#include "devices/BufferedCGA.h"
+// #include "devices/BufferedCGA.h"
+#include "devices/CGA.h"
 #include "lib/OutStream.h"
 
 // NOTE: I added this
@@ -33,7 +34,7 @@ public:
 };
 
 // NOTE: I added this (changed this) to use BufferedCGA
-class CGA_Stream : public OutStream, public BufferedCGA {
+class CGA_Stream : public OutStream, public CGA {
 private:
     CGA_Stream(CGA_Stream& copy) = delete;  // Verhindere Kopieren
 
diff --git a/c_os/devices/Keyboard.cc b/c_os/devices/Keyboard.cc
index fce3400..657e62d 100755
--- a/c_os/devices/Keyboard.cc
+++ b/c_os/devices/Keyboard.cc
@@ -340,9 +340,10 @@ void Keyboard::trigger() {
     // NOTE: My keyboard has no delete key...
     if (key.ctrl_left() && key.alt_left() && (char)key == 'r') {
         this->reboot();
-    } else if ((char)key == 'k' || (char)key == 'j') {
-        scroll_mode(key);
     }
+    // else if ((char)key == 'k' || (char)key == 'j') {
+    //     scroll_mode(key);
+    // }
 }
 
 // TODO: Where to place this?
@@ -350,13 +351,13 @@ void Keyboard::trigger() {
 //        - Ereignisverwaltung, wo man Threads registrieren kann
 //        - Blockierte Threads verwalten und aufwecken bei ereignissen
 // Waits for keys to control the scrollback buffer display
-void scroll_mode(Key key) {
-    switch ((char)key) {
-    case 'k':
-        kout.scroll_page_backward();
-        break;
-    case 'j':
-        kout.scroll_page_forward();
-        break;
-    }
-}
+// void scroll_mode(Key key) {
+//     switch ((char)key) {
+//     case 'k':
+//         kout.scroll_page_backward();
+//         break;
+//     case 'j':
+//         kout.scroll_page_forward();
+//         break;
+//     }
+// }
diff --git a/c_os/kernel/Globals.cc b/c_os/kernel/Globals.cc
index b84d58d..0764a05 100755
--- a/c_os/kernel/Globals.cc
+++ b/c_os/kernel/Globals.cc
@@ -17,9 +17,9 @@ Keyboard kb;             // Tastatur
 IntDispatcher intdis;    // Unterbrechungsverteilung
 PIC pic;                 // Interrupt-Controller
 unsigned int total_mem;  // RAM total
-// BumpAllocator         allocator;
+BumpAllocator         allocator;
 // LinkedListAllocator allocator;
-TreeAllocator allocator;
+// TreeAllocator allocator;
 Scheduler scheduler;
 BIOS bios;  // Schnittstelle zum 16-Bit BIOS
 VESA vesa;  // VESA-Treiber
diff --git a/c_os/kernel/Globals.h b/c_os/kernel/Globals.h
index a1aa79b..561b28e 100755
--- a/c_os/kernel/Globals.h
+++ b/c_os/kernel/Globals.h
@@ -30,9 +30,9 @@ extern Keyboard kb;             // Tastatur
 extern IntDispatcher intdis;    // Unterbrechungsverteilung
 extern PIC pic;                 // Interrupt-Controller
 extern unsigned int total_mem;  // RAM total
-// extern BumpAllocator         allocator;
+extern BumpAllocator         allocator;
 // extern LinkedListAllocator allocator;
-extern TreeAllocator allocator;
+// extern TreeAllocator allocator;
 extern Scheduler scheduler;
 extern BIOS bios;  // Schnittstelle zum 16-Bit BIOS
 extern VESA vesa;  // VESA-Treiber