diff --git a/build.sh b/build.sh
index 816f3c4..cb67af8 100755
--- a/build.sh
+++ b/build.sh
@@ -41,7 +41,7 @@ case $yn in
 	sudo losetup -d /dev/loop800
 	dd if=/dev/zero of=build/main.img bs=512 count=50000
 	mkdir -p build/mnt
-	sudo losetup /dev/loop800 build/main.img
+	sudo losetup -P /dev/loop800 build/main.img
 	sudo parted /dev/loop800 mktable msdos
 	sudo parted /dev/loop800 mkpart primary fat16 2048s 100%
 	sudo parted /dev/loop800p1 set 1 boot on
@@ -52,7 +52,7 @@ case $yn in
 	sudo mkdir build/mnt/misc
 	sudo mkdir build/mnt/misc/src
 	sudo cp -r src/* build/mnt/src
-	sudo cp -r grub/* build/mnt/grub
+	sudo cp -r grub/* build/mnt/boot/grub
 	sudo cp build/nanite.bin build/mnt/boot/nanite
 	sudo grub-install \
 		--modules="part_msdos" \
diff --git a/grub/grub.cfg b/grub/grub.cfg
index ea757c6..8e2d91e 100644
--- a/grub/grub.cfg
+++ b/grub/grub.cfg
@@ -1,7 +1,13 @@
-set timeout=15
+set timeout=5
 set default=0
 
+insmod part_msdos
+set root='hd0,1'
+
 menuentry "NANITE" {
-   multiboot2 /boot/nanite.bin
+   set root='hd0,1'
+   insmod fat
+   multiboot2 /boot/nanite
+   echo "Booting NANITE..."
    boot
 }
\ No newline at end of file
diff --git a/src/kernel/arch/i686/irq.c b/src/kernel/arch/i686/irq.c
index 30246a4..b6489ee 100644
--- a/src/kernel/arch/i686/irq.c
+++ b/src/kernel/arch/i686/irq.c
@@ -8,9 +8,12 @@
 #include "io.h"
 #include <stddef.h>
 #include <stdio.h>
+#include <dri/serial.h>
 
 #define PIC_REMAP_OFFSET        0x20
 
+extern uint16_t DEBUG_COM_PORT;
+
 IRQHandler g_IRQHandlers[16];
 
 void IRQ_Handler(Registers* regs)
@@ -24,7 +27,7 @@ void IRQ_Handler(Registers* regs)
     }
     else
     {
-        printf("Unhandled IRQ %d...\n", irq);
+        Serial_Printf(DEBUG_COM_PORT, "Unhandled IRQ %d...\n", irq);
     }
 
     PIC_SendEndOfInterrupt(irq);
diff --git a/src/kernel/boot.asm b/src/kernel/multiboot.asm
similarity index 100%
rename from src/kernel/boot.asm
rename to src/kernel/multiboot.asm
diff --git a/src/kernel/version.h b/src/kernel/version.h
index e98fd01..d01e3bc 100644
--- a/src/kernel/version.h
+++ b/src/kernel/version.h
@@ -6,4 +6,4 @@
 #pragma once
 
 #define LOGO "    _   _____    _   __________________\n   / | / /   |  / | / /  _/_  __/ ____/\n  /  |/ / /| | /  |/ // /  / / / __/   \n / /|  / ___ |/ /|  // /  / / / /___   \n/_/ |_/_/  |_/_/ |_/___/ /_/ /_____/   \n"
-#define VERSION "RD-00040"
\ No newline at end of file
+#define VERSION "RD-00041"
\ No newline at end of file