diff --git a/c_os/main.cc b/c_os/main.cc
index 55c91b9..3aa2601 100755
--- a/c_os/main.cc
+++ b/c_os/main.cc
@@ -35,6 +35,10 @@ void print_startup_message() {
 }
 
 int main() {
+    Logger::set_level(Logger::DEBUG);
+    Logger::disable_kout();
+    Logger::enable_serial();
+
     kout.clear();
 
     // Startmeldung
@@ -43,9 +47,6 @@ int main() {
     // Speicherverwaltung initialisieren
     allocator.init();
 
-    // Initialize SerialPort
-    serial.init();
-
     // Tastatur-Unterbrechungsroutine 'einstoepseln'
     kb.plugin();
     pit.plugin();
@@ -71,6 +72,7 @@ int main() {
     // TODO: Make menu for demos
     // DONE: Thread switching stops after a while
     // TODO: Threads are not cleanup after exit, use managed pointer?
+    // TODO: Fix PCSKP/Keyboard Demos: Keyboard Thread gets missing after blocking waiting for input, kevman doesn't wake up...
     //
     // NOTE: Main ToDo's (extra)
     // DONE: Basic event management for keyboard events so threads can utilize interrupt based inputs
@@ -103,6 +105,7 @@ int main() {
     //       Or check if thread is still running
     // TODO: Delete copy constructors that weren't already deleted
     // DONE: Switch out semaphore Queue with ArrayList? Or switch back Scheduler to Queue?
+    // TODO: Add virtual destructors and make sure to call them with delete when objects are removed
 
     // Scheduler doesn't return
     return 0;