diff --git a/kernel/arch/i386/boot.S b/kernel/arch/i386/boot.S
index 7f12a4a..1b92bb9 100644
--- a/kernel/arch/i386/boot.S
+++ b/kernel/arch/i386/boot.S
@@ -70,7 +70,7 @@ idt_flush:
 isr\num:
         cli
         push $0x0
-        push $0x\num
+        push $\num
 	jmp isr_common_stub
 .endm
 
@@ -78,7 +78,7 @@ isr\num:
 .global isr\num
 isr\num:
         cli
-        push $0x\num
+        push $\num
 	jmp isr_common_stub
 .endm
 
@@ -89,7 +89,7 @@ isr\num:
 irq\num:
     cli
     push $0x0
-    push $0x\to
+    push $\to
     jmp irq_common_stub
 .endm
 	
diff --git a/kernel/kernel/interrupts.c b/kernel/kernel/interrupts.c
index a2a77fc..e510aef 100644
--- a/kernel/kernel/interrupts.c
+++ b/kernel/kernel/interrupts.c
@@ -36,6 +36,17 @@ typedef struct idt_ptr_struct idt_ptr_t;
 idt_entry_t idt_entries[256];
 idt_ptr_t idt_ptr;
 
+typedef struct registers
+{
+   uint32_t ds;                  // Data segment selector
+   uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax; // Pushed by pusha.
+   uint32_t int_no, err_code;    // Interrupt number and error code (if applicable)
+   uint32_t eip, cs, eflags, useresp, ss; // Pushed by the processor automatically.
+} registers_t;
+
+typedef void (*isr_t)(registers_t);
+isr_t interrupt_handlers[256];
+
 void idt_set_gate(uint8_t num, uint32_t base, uint16_t sel, uint8_t flags) {
   idt_entries[num].base_lo = base & 0xFFFF;
   idt_entries[num].base_hi = (base >> 16) & 0xFFFF;
@@ -49,9 +60,9 @@ void idt_set_gate(uint8_t num, uint32_t base, uint16_t sel, uint8_t flags) {
 void idt_init(void);
 void idt_init() {
   idt_ptr.limit = sizeof(idt_entry_t) * 256 - 1;
-  idt_ptr.base = (uint32_t)&idt_entries;
+  idt_ptr.base = (uint32_t)idt_entries;
 
-  memset(&idt_entries, 0, sizeof(idt_entry_t)*256);
+  memset(idt_entries, 0, sizeof(idt_entry_t)*256);
 
   // Remap the irq table.
   outb(0x20, 0x11);
@@ -65,125 +76,114 @@ void idt_init() {
   outb(0x21, 0x0);
   outb(0xA1, 0x0);
   
-  extern int isr0;
-  extern int isr1;
-  extern int isr2;
-  extern int isr3;
-  extern int isr4;
-  extern int isr5;
-  extern int isr6;
-  extern int isr7;
-  extern int isr8;
-  extern int isr9;
-  extern int isr10;
-  extern int isr11;
-  extern int isr12;
-  extern int isr13;
-  extern int isr14;
-  extern int isr15;
-  extern int isr16;
-  extern int isr17;
-  extern int isr18;
-  extern int isr19;
-  extern int isr20;
-  extern int isr21;
-  extern int isr22;
-  extern int isr23;
-  extern int isr24;
-  extern int isr25;
-  extern int isr26;
-  extern int isr27;
-  extern int isr28;
-  extern int isr29;
-  extern int isr30;
-  extern int isr31;
+  extern isr_t isr0;
+  extern isr_t isr1;
+  extern isr_t isr2;
+  extern isr_t isr3;
+  extern isr_t isr4;
+  extern isr_t isr5;
+  extern isr_t isr6;
+  extern isr_t isr7;
+  extern isr_t isr8;
+  extern isr_t isr9;
+  extern isr_t isr10;
+  extern isr_t isr11;
+  extern isr_t isr12;
+  extern isr_t isr13;
+  extern isr_t isr14;
+  extern isr_t isr15;
+  extern isr_t isr16;
+  extern isr_t isr17;
+  extern isr_t isr18;
+  extern isr_t isr19;
+  extern isr_t isr20;
+  extern isr_t isr21;
+  extern isr_t isr22;
+  extern isr_t isr23;
+  extern isr_t isr24;
+  extern isr_t isr25;
+  extern isr_t isr26;
+  extern isr_t isr27;
+  extern isr_t isr28;
+  extern isr_t isr29;
+  extern isr_t isr30;
+  extern isr_t isr31;
 
-  extern int irq0;
-  extern int irq1;
-  extern int irq2;
-  extern int irq3;
-  extern int irq4;
-  extern int irq5;
-  extern int irq6;
-  extern int irq7;
-  extern int irq8;
-  extern int irq9;
-  extern int irq10;
-  extern int irq11;
-  extern int irq12;
-  extern int irq13;
-  extern int irq14;
-  extern int irq15;
+  extern isr_t irq0;
+  extern isr_t irq1;
+  extern isr_t irq2;
+  extern isr_t irq3;
+  extern isr_t irq4;
+  extern isr_t irq5;
+  extern isr_t irq6;
+  extern isr_t irq7;
+  extern isr_t irq8;
+  extern isr_t irq9;
+  extern isr_t irq10;
+  extern isr_t irq11;
+  extern isr_t irq12;
+  extern isr_t irq13;
+  extern isr_t irq14;
+  extern isr_t irq15;
   
-  idt_set_gate(0, (uint32_t)isr0, 0x08, 0x8E);
-  idt_set_gate(1, (uint32_t)isr1, 0x08, 0x8E);
-  idt_set_gate(2, (uint32_t)isr2, 0x08, 0x8E);
-  idt_set_gate(3, (uint32_t)isr3, 0x08, 0x8E);
-  idt_set_gate(4, (uint32_t)isr4, 0x08, 0x8E);
-  idt_set_gate(5, (uint32_t)isr5, 0x08, 0x8E);
-  idt_set_gate(6, (uint32_t)isr6, 0x08, 0x8E);
-  idt_set_gate(7, (uint32_t)isr7, 0x08, 0x8E);
-  idt_set_gate(8, (uint32_t)isr8, 0x08, 0x8E);
-  idt_set_gate(9, (uint32_t)isr9, 0x08, 0x8E);
-  idt_set_gate(10, (uint32_t)isr10, 0x08, 0x8E);
-  idt_set_gate(11, (uint32_t)isr11, 0x08, 0x8E);
-  idt_set_gate(12, (uint32_t)isr12, 0x08, 0x8E);
-  idt_set_gate(13, (uint32_t)isr13, 0x08, 0x8E);
-  idt_set_gate(14, (uint32_t)isr14, 0x08, 0x8E);
-  idt_set_gate(15, (uint32_t)isr15, 0x08, 0x8E);
-  idt_set_gate(16, (uint32_t)isr16, 0x08, 0x8E);
-  idt_set_gate(17, (uint32_t)isr17, 0x08, 0x8E);
-  idt_set_gate(18, (uint32_t)isr18, 0x08, 0x8E);
-  idt_set_gate(19, (uint32_t)isr19, 0x08, 0x8E);
-  idt_set_gate(20, (uint32_t)isr20, 0x08, 0x8E);
-  idt_set_gate(21, (uint32_t)isr21, 0x08, 0x8E);
-  idt_set_gate(22, (uint32_t)isr22, 0x08, 0x8E);
-  idt_set_gate(23, (uint32_t)isr23, 0x08, 0x8E);
-  idt_set_gate(24, (uint32_t)isr24, 0x08, 0x8E);
-  idt_set_gate(25, (uint32_t)isr25, 0x08, 0x8E);
-  idt_set_gate(26, (uint32_t)isr26, 0x08, 0x8E);
-  idt_set_gate(27, (uint32_t)isr27, 0x08, 0x8E);
-  idt_set_gate(28, (uint32_t)isr28, 0x08, 0x8E);
-  idt_set_gate(29, (uint32_t)isr29, 0x08, 0x8E);
-  idt_set_gate(30, (uint32_t)isr30, 0x08, 0x8E);
-  idt_set_gate(31, (uint32_t)isr31, 0x08, 0x8E);
+  idt_set_gate(0, (uint32_t)&isr0, 0x08, 0x8E);
+  idt_set_gate(1, (uint32_t)&isr1, 0x08, 0x8E);
+  idt_set_gate(2, (uint32_t)&isr2, 0x08, 0x8E);
+  idt_set_gate(3, (uint32_t)&isr3, 0x08, 0x8E);
+  idt_set_gate(4, (uint32_t)&isr4, 0x08, 0x8E);
+  idt_set_gate(5, (uint32_t)&isr5, 0x08, 0x8E);
+  idt_set_gate(6, (uint32_t)&isr6, 0x08, 0x8E);
+  idt_set_gate(7, (uint32_t)&isr7, 0x08, 0x8E);
+  idt_set_gate(8, (uint32_t)&isr8, 0x08, 0x8E);
+  idt_set_gate(9, (uint32_t)&isr9, 0x08, 0x8E);
+  idt_set_gate(10, (uint32_t)&isr10, 0x08, 0x8E);
+  idt_set_gate(11, (uint32_t)&isr11, 0x08, 0x8E);
+  idt_set_gate(12, (uint32_t)&isr12, 0x08, 0x8E);
+  idt_set_gate(13, (uint32_t)&isr13, 0x08, 0x8E);
+  idt_set_gate(14, (uint32_t)&isr14, 0x08, 0x8E);
+  idt_set_gate(15, (uint32_t)&isr15, 0x08, 0x8E);
+  idt_set_gate(16, (uint32_t)&isr16, 0x08, 0x8E);
+  idt_set_gate(17, (uint32_t)&isr17, 0x08, 0x8E);
+  idt_set_gate(18, (uint32_t)&isr18, 0x08, 0x8E);
+  idt_set_gate(19, (uint32_t)&isr19, 0x08, 0x8E);
+  idt_set_gate(20, (uint32_t)&isr20, 0x08, 0x8E);
+  idt_set_gate(21, (uint32_t)&isr21, 0x08, 0x8E);
+  idt_set_gate(22, (uint32_t)&isr22, 0x08, 0x8E);
+  idt_set_gate(23, (uint32_t)&isr23, 0x08, 0x8E);
+  idt_set_gate(24, (uint32_t)&isr24, 0x08, 0x8E);
+  idt_set_gate(25, (uint32_t)&isr25, 0x08, 0x8E);
+  idt_set_gate(26, (uint32_t)&isr26, 0x08, 0x8E);
+  idt_set_gate(27, (uint32_t)&isr27, 0x08, 0x8E);
+  idt_set_gate(28, (uint32_t)&isr28, 0x08, 0x8E);
+  idt_set_gate(29, (uint32_t)&isr29, 0x08, 0x8E);
+  idt_set_gate(30, (uint32_t)&isr30, 0x08, 0x8E);
+  idt_set_gate(31, (uint32_t)&isr31, 0x08, 0x8E);
  
-  idt_set_gate(32, (uint32_t)irq0, 0x08, 0x8E);
-  idt_set_gate(33, (uint32_t)irq1, 0x08, 0x8E);
-  idt_set_gate(34, (uint32_t)irq2, 0x08, 0x8E);
-  idt_set_gate(35, (uint32_t)irq3, 0x08, 0x8E);
-  idt_set_gate(36, (uint32_t)irq4, 0x08, 0x8E);
-  idt_set_gate(37, (uint32_t)irq5, 0x08, 0x8E);
-  idt_set_gate(38, (uint32_t)irq6, 0x08, 0x8E);
-  idt_set_gate(39, (uint32_t)irq7, 0x08, 0x8E);
-  idt_set_gate(40, (uint32_t)irq8, 0x08, 0x8E);
-  idt_set_gate(41, (uint32_t)irq9, 0x08, 0x8E);
-  idt_set_gate(42, (uint32_t)irq10, 0x08, 0x8E);
-  idt_set_gate(43, (uint32_t)irq11, 0x08, 0x8E);
-  idt_set_gate(44, (uint32_t)irq12, 0x08, 0x8E);
-  idt_set_gate(45, (uint32_t)irq13, 0x08, 0x8E);
-  idt_set_gate(46, (uint32_t)irq14, 0x08, 0x8E);
-  idt_set_gate(47, (uint32_t)irq15, 0x08, 0x8E);
+  idt_set_gate(32, (uint32_t)&irq0, 0x08, 0x8E);
+  idt_set_gate(33, (uint32_t)&irq1, 0x08, 0x8E);
+  idt_set_gate(34, (uint32_t)&irq2, 0x08, 0x8E);
+  idt_set_gate(35, (uint32_t)&irq3, 0x08, 0x8E);
+  idt_set_gate(36, (uint32_t)&irq4, 0x08, 0x8E);
+  idt_set_gate(37, (uint32_t)&irq5, 0x08, 0x8E);
+  idt_set_gate(38, (uint32_t)&irq6, 0x08, 0x8E);
+  idt_set_gate(39, (uint32_t)&irq7, 0x08, 0x8E);
+  idt_set_gate(40, (uint32_t)&irq8, 0x08, 0x8E);
+  idt_set_gate(41, (uint32_t)&irq9, 0x08, 0x8E);
+  idt_set_gate(42, (uint32_t)&irq10, 0x08, 0x8E);
+  idt_set_gate(43, (uint32_t)&irq11, 0x08, 0x8E);
+  idt_set_gate(44, (uint32_t)&irq12, 0x08, 0x8E);
+  idt_set_gate(45, (uint32_t)&irq13, 0x08, 0x8E);
+  idt_set_gate(46, (uint32_t)&irq14, 0x08, 0x8E);
+  idt_set_gate(47, (uint32_t)&irq15, 0x08, 0x8E);
 
   extern void idt_flush(uint32_t);
   idt_flush((uint32_t)&idt_ptr);
 }
 
-typedef struct registers
-{
-   uint32_t ds;                  // Data segment selector
-   uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax; // Pushed by pusha.
-   uint32_t int_no, err_code;    // Interrupt number and error code (if applicable)
-   uint32_t eip, cs, eflags, useresp, ss; // Pushed by the processor automatically.
-} registers_t;
-
-typedef void (*isr_t)(registers_t);
-isr_t interrupt_handlers[256];
-
 void isr_handler(registers_t regs)
 {
-  printf("Received Interrupr\n");
-  serial_printf("Received interrupt: %s\n", regs.int_no);
+  printf("Received Interrupt: %s\n", regs.int_no); // TODO: Fix from %s to %X
+  serial_printf("Received interrupt: %s\n", regs.int_no); // TODO: Fix %s to %X
 
   if (interrupt_handlers[regs.int_no] != 0)
   {
diff --git a/kernel/kernel/kernel.c b/kernel/kernel/kernel.c
index bfb7eb8..51cc37b 100644
--- a/kernel/kernel/kernel.c
+++ b/kernel/kernel/kernel.c
@@ -8,5 +8,7 @@ void kernel_main(void) {
 	serial_printf("Newline test\n");
 	char * test_string = "test";
 	serial_printf("This is string from variable: %s\n", test_string);
+
+	asm volatile ("int $0x3");
 	printf("Test finished success!\n");
 }