diff --git a/include/mem/gdt.h b/include/arch/gdt.h
similarity index 100%
rename from include/mem/gdt.h
rename to include/arch/gdt.h
diff --git a/include/mem/kheap.h b/include/mem/kheap.h
index ee4672d..52a9fb7 100644
--- a/include/mem/kheap.h
+++ b/include/mem/kheap.h
@@ -28,5 +28,6 @@ void* kmalloc(size_t size);
 void kfree(void* ptr);
 void* kalloc_stack(void);
 void kheap_map_page(void);
+void kheap_info();
 
 #endif
\ No newline at end of file
diff --git a/include/sched/spinlock.h b/include/sched/spinlock.h
index 849d99d..fabf089 100644
--- a/include/sched/spinlock.h
+++ b/include/sched/spinlock.h
@@ -1,4 +1,4 @@
-/*
+        /*
  * @author  xamidev <xamidev@riseup.net>
  * @brief   Spinlock implementation
  * @license GPL-3.0-only
diff --git a/include/security/ubsan.h b/include/security/ubsan.h
index 6f2609a..0282a02 100644
--- a/include/security/ubsan.h
+++ b/include/security/ubsan.h
@@ -62,5 +62,4 @@ struct ubsan_overflow_data
 	struct ubsan_type_descriptor* type;
 };
 
-
 #endif
\ No newline at end of file
diff --git a/src/mem/gdt.c b/src/arch/x86/gdt.c
similarity index 99%
rename from src/mem/gdt.c
rename to src/arch/x86/gdt.c
index 3fe0c06..54dd6fc 100644
--- a/src/mem/gdt.c
+++ b/src/arch/x86/gdt.c
@@ -4,7 +4,7 @@
  * @license GPL-3.0-only
  */
 
-#include <mem/gdt.h>
+#include <arch/gdt.h>
 #include <stdint.h>
 #include <io/serial/serial.h>
 #include <kernel.h>
diff --git a/src/arch/x86/init.c b/src/arch/x86/init.c
index bc4b461..040ddf1 100644
--- a/src/arch/x86/init.c
+++ b/src/arch/x86/init.c
@@ -4,7 +4,7 @@
  * @license GPL-3.0-only
  */
 
-#include <mem/gdt.h>
+#include <arch/gdt.h>
 #include <stdint.h>
 #include <arch/x86.h>
 #include <kernel.h>
diff --git a/src/io/kbd/ps2.c b/src/io/kbd/ps2.c
index aea8c13..b9029d8 100644
--- a/src/io/kbd/ps2.c
+++ b/src/io/kbd/ps2.c
@@ -289,15 +289,21 @@ int keyboard_getline(char* output, size_t size)
     
     // Read until Enter is pressed
     while ((c = keyboard_getchar()) != 0x0A) {
-        if (index == size-1) {
-            output[index] = c;
-            output[index+1] = '\0';
-            return index;
+        if (c == '\b') {
+            if (index > 0) {
+                index--;
+                output[index] = '\0';
+                printf(" \b");
+            }
+            continue;
         }
-        output[index] = c;
-        index++;
+
+        if (index >= size-1) {
+            continue;
+        }
+        output[index++] = c;
     }
-    output[index+1] = '\0';
+    output[index] = '\0';
     return index;
 }
 
diff --git a/src/kapps/kshell.c b/src/kapps/kshell.c
index e1ed05b..f4a6852 100644
--- a/src/kapps/kshell.c
+++ b/src/kapps/kshell.c
@@ -11,6 +11,7 @@
 #include <stdint.h>
 #include <kernel.h>
 #include <time/date.h>
+#include <mem/kheap.h>
 
 __attribute__((noinline))
 void smash_it()
@@ -49,7 +50,8 @@ void pedicel_main(void* arg)
                             "syscall - trigger int 0x80\r\n"
                             "pf      - trigger a page fault\r\n"
                             "now     - get current date\r\n"
-                            "smash   - smash the stack\r\n");
+                            "smash   - smash the stack\r\n"
+                            "mem     - get used heap info\r\n");
             continue;
         }
 
@@ -89,6 +91,11 @@ void pedicel_main(void* arg)
             continue;
         }
 
+        if (strncmp(input_buf, "mem", 3) == 0) {
+            kheap_info();
+            continue;
+        }
+
         printf("%s: command not found\r\n", input_buf);
     }
 }
\ No newline at end of file
diff --git a/src/kmain.c b/src/kmain.c
index d9a4404..813e761 100644
--- a/src/kmain.c
+++ b/src/kmain.c
@@ -9,7 +9,7 @@
 #include <limine.h>
 #include <io/term/term.h>
 #include <io/serial/serial.h>
-#include <mem/gdt.h>
+#include <arch/gdt.h>
 #include <mem/utils.h>
 #include <kernel.h>
 #include <time/timer.h>
diff --git a/src/mem/kheap.c b/src/mem/kheap.c
index 20f302c..2359c36 100644
--- a/src/mem/kheap.c
+++ b/src/mem/kheap.c
@@ -157,4 +157,33 @@ void* kalloc_stack()
 {
     uint8_t* ptr = kmalloc(PROCESS_STACK_SIZE); // As it's out of kmalloc, stack is already mapped into kernel space
     return ptr ? ptr+PROCESS_STACK_SIZE : NULL;
+}
+
+/*
+ * kheap_info - Display heap info
+ *
+ * This function writes the size of the heap (total),
+ * the number of allocated bytes, and the number of
+ * free bytes to the standard output.
+ */
+void kheap_info()
+{
+    uint64_t free_bytes = 0;
+    struct heap_block_t* curr = (struct heap_block_t*)kheap_start;
+
+    while (curr) {
+        if (curr->free == true) {
+            free_bytes += curr->size;
+        }
+        curr = curr->next;
+    }
+
+    uint64_t total = end-kheap_start;
+
+    printf("total=% 8u bytes (%u kB)\r\n"
+                "alloc=% 8u bytes (%u kB)\r\n"
+                " free=% 8u bytes (%u kB)\r\n",
+                total, (total)/1000,
+                total-free_bytes, (total-free_bytes)/1000,
+                free_bytes, free_bytes/1000);
 }
\ No newline at end of file
diff --git a/src/sched/process.c b/src/sched/process.c
index 5c2f600..9a20c42 100644
--- a/src/sched/process.c
+++ b/src/sched/process.c
@@ -9,11 +9,11 @@
 #include <mem/kheap.h>
 #include <kernel.h>
 #include <string/string.h>
-#include <mem/gdt.h>
+#include <arch/gdt.h>
 #include <config.h>
 #include <io/serial/serial.h>
-
 #include <io/term/flanterm.h>
+
 extern struct flanterm_context* ft_ctx;
 
 struct process_t* processes_list;