diff --git a/boot/loader/io/terminal.inc b/boot/loader/io/terminal.inc
index 0a6e89a..312f0e2 100644
--- a/boot/loader/io/terminal.inc
+++ b/boot/loader/io/terminal.inc
@@ -98,9 +98,6 @@ write:
     mov qword [VGA_X], 0
     pop rax
     jmp .pLoop
-.scroll:
-    ; XXX I don't think I'll implement this, but never know...;
-    jmp .pLoop
 
 dump:
 ;-----------------------------------------------------------------------;
diff --git a/boot/loader/mem/management.inc b/boot/loader/mem/management.inc
index d86345f..dc67950 100644
--- a/boot/loader/mem/management.inc
+++ b/boot/loader/mem/management.inc
@@ -124,7 +124,6 @@ CheckA20:
 ;                                                                              ;
 ; Not a function because it wipes the stack ;)                                 ;
 ; ---------------------------------------------------------------------------- ;
-; XXX : MAKE A PAGE GUARD FOR THE STACK
 InitStack:
     xor rax, rax                        ; "Fill pattern"
     push rcx
@@ -166,4 +165,4 @@ InitStack:
 
     pop rdi
     pop rcx
-    jmp AfterInitStack
+    jmp AfterInitStack
\ No newline at end of file
diff --git a/kaleid/kernel/io/ata.asm b/kaleid/kernel/io/ata.asm
index 6c07fb3..b1bf8f9 100644
--- a/kaleid/kernel/io/ata.asm
+++ b/kaleid/kernel/io/ata.asm
@@ -56,8 +56,8 @@ Bootdrv         db  0
 IoReadATA:
 ;-----------------------------------------------------------------------;
 ; x64/LM ATA Reading function                                           ;
-; rsi : number of sectors to read  XXX                                   ;
-; rdx : the first sector to read                                         ;
+; rsi : number of sectors to read  XXX seems to be buggy                ;
+; rdx : the first sector to read                                        ;
 ;-----------------------------------------------------------------------;
 
 ;  Technical infos about the ports (Intel Doc):
@@ -136,4 +136,4 @@ still_going:
     mov dx, 0x1f0                            ; Data port - data comes in and out of here.
     rep insw
     pop rbx
-    ret
+    ret
\ No newline at end of file
diff --git a/kaleid/kernel/ke/idt.c b/kaleid/kernel/ke/idt.c
index 8a1307c..9a4f63c 100644
--- a/kaleid/kernel/ke/idt.c
+++ b/kaleid/kernel/ke/idt.c
@@ -110,7 +110,7 @@ settingUp:
 //
 void KeSetupIDT(void)
 {
-    // XXX detect the APIC with cpuid !
+    // XXX detect the APIC with cpuid and, perhaps, use it !
     EnablePIC();
 
     ushort codeSeg = (ushort)(ulong)BtLoaderInfo.codeSegment;
diff --git a/kaleid/libbuf/bprint.c b/kaleid/libbuf/bprint.c
index 9f5e7a8..48dbdeb 100644
--- a/kaleid/libbuf/bprint.c
+++ b/kaleid/libbuf/bprint.c
@@ -333,7 +333,6 @@ error_t vbprintf(Buffer_t *buf, const char *fmt, va_list ap)
         // We use s to iterate convbuf
         s = convbuf;
 
-        // FIXME: this works, but is ugly as hell
         #define bdoconvrt(pref, type, vtype)                    \
             do {                                                \
                 type i_##type = (type)va_arg(ap, vtype);        \