diff --git a/interrupt_entry.s b/interrupt_entry.s
index 9626b2b..49428bc 100644
--- a/interrupt_entry.s
+++ b/interrupt_entry.s
@@ -73,6 +73,7 @@ common_int_handler:
 	iret 	
 
 
+no_err_handler 0
 no_err_handler 1
 no_err_handler 2
 no_err_handler 3
@@ -93,9 +94,7 @@ err_code_handler 14
 
 no_err_handler 15
 no_err_handler 16
-
-err_code_handler 17
-
+no_err_handler 17
 no_err_handler 18
 no_err_handler 19
 no_err_handler 20
@@ -110,4 +109,3 @@ no_err_handler 28
 no_err_handler 29
 no_err_handler 30
 no_err_handler 31
-no_err_handler 32
diff --git a/interrupts.c b/interrupts.c
index 7f8914f..8024bf0 100644
--- a/interrupts.c
+++ b/interrupts.c
@@ -28,6 +28,7 @@ const char* err_msg[] = {
 };
 
 extern void load_idt(); // found in interrupts_entry.s
+extern void no_err_handler_0();
 extern void no_err_handler_1();
 extern void no_err_handler_2();
 extern void no_err_handler_3();
@@ -48,9 +49,7 @@ extern void err_code_handler_14();
 
 extern void no_err_handler_15();
 extern void no_err_handler_16();
-
-extern void err_code_handler_17();
-
+extern void no_err_handler_17();
 extern void no_err_handler_18();
 extern void no_err_handler_19();
 extern void no_err_handler_20();
@@ -65,7 +64,6 @@ extern void no_err_handler_28();
 extern void no_err_handler_29();
 extern void no_err_handler_30();
 extern void no_err_handler_31();
-extern void no_err_handler_32();
 
 
 void setup_idt_entry(u32 t_idx, u32 base, u16 sel, u8 type_attrs) {
@@ -106,44 +104,43 @@ void init_idt() {
 	// clear table
 	memset((u8*)IDT, 0x00, (sizeof(struct IDT_Entry) * IDT_SIZE));
 	// add interrupt service routines here
-	setup_idt_entry(0,(u32)no_err_handler_1,0x08, 0x8e);
-	setup_idt_entry(1,(u32)no_err_handler_2,0x08, 0x8e);
-	setup_idt_entry(2,(u32)no_err_handler_3,0x08, 0x8e);
-	setup_idt_entry(3,(u32)no_err_handler_4,0x08, 0x8e);
-	setup_idt_entry(4,(u32)no_err_handler_5,0x08, 0x8e);
-	setup_idt_entry(5,(u32)no_err_handler_6,0x08, 0x8e);
-	setup_idt_entry(6,(u32)no_err_handler_7,0x08, 0x8e);
+	setup_idt_entry(0,(u32)no_err_handler_0,0x08, 0x8e);
+	setup_idt_entry(1,(u32)no_err_handler_1,0x08, 0x8e);
+	setup_idt_entry(2,(u32)no_err_handler_2,0x08, 0x8e);
+	setup_idt_entry(3,(u32)no_err_handler_3,0x08, 0x8e);
+	setup_idt_entry(4,(u32)no_err_handler_4,0x08, 0x8e);
+	setup_idt_entry(5,(u32)no_err_handler_5,0x08, 0x8e);
+	setup_idt_entry(6,(u32)no_err_handler_6,0x08, 0x8e);
+	setup_idt_entry(7,(u32)no_err_handler_7,0x08, 0x8e);
 
-	setup_idt_entry(7,(u32)err_code_handler_8,0x08, 0x8e);
+	setup_idt_entry(8,(u32)err_code_handler_8,0x08, 0x8e);
 
-	setup_idt_entry(8,(u32)no_err_handler_9,0x08, 0x8e);
+	setup_idt_entry(9,(u32)no_err_handler_9,0x08, 0x8e);
 
-	setup_idt_entry(9,(u32)err_code_handler_10,0x08, 0x8e);
-	setup_idt_entry(10,(u32)err_code_handler_11,0x08, 0x8e);	
-	setup_idt_entry(11,(u32)err_code_handler_12,0x08, 0x8e);
-	setup_idt_entry(12,(u32)err_code_handler_13,0x08, 0x8e);
-	setup_idt_entry(13,(u32)err_code_handler_14,0x08, 0x8e);
 
-	setup_idt_entry(14,(u32)no_err_handler_15,0x08, 0x8e);
-	setup_idt_entry(15,(u32)no_err_handler_16,0x08, 0x8e);
+	setup_idt_entry(10,(u32)err_code_handler_10,0x08, 0x8e);	
+	setup_idt_entry(11,(u32)err_code_handler_11,0x08, 0x8e);
+	setup_idt_entry(12,(u32)err_code_handler_12,0x08, 0x8e);
+	setup_idt_entry(13,(u32)err_code_handler_13,0x08, 0x8e);
+	setup_idt_entry(14,(u32)err_code_handler_14,0x08, 0x8e);
 
-	setup_idt_entry(16,(u32)err_code_handler_17,0x08, 0x8e);
-
-	setup_idt_entry(17,(u32)no_err_handler_18,0x08, 0x8e);
-	setup_idt_entry(18,(u32)no_err_handler_19,0x08, 0x8e);
-	setup_idt_entry(19,(u32)no_err_handler_20,0x08, 0x8e);
-	setup_idt_entry(20,(u32)no_err_handler_21,0x08, 0x8e);
-	setup_idt_entry(21,(u32)no_err_handler_22,0x08, 0x8e);
-	setup_idt_entry(22,(u32)no_err_handler_23,0x08, 0x8e);
-	setup_idt_entry(23,(u32)no_err_handler_24,0x08, 0x8e);
-	setup_idt_entry(24,(u32)no_err_handler_25,0x08, 0x8e);
-	setup_idt_entry(25,(u32)no_err_handler_26,0x08, 0x8e);
-	setup_idt_entry(26,(u32)no_err_handler_27,0x08, 0x8e);
-	setup_idt_entry(27,(u32)no_err_handler_28,0x08, 0x8e);
-	setup_idt_entry(28,(u32)no_err_handler_29,0x08, 0x8e);
-	setup_idt_entry(29,(u32)no_err_handler_30,0x08, 0x8e);
-	setup_idt_entry(30,(u32)no_err_handler_31,0x08, 0x8e);
-	setup_idt_entry(31,(u32)no_err_handler_32,0x08, 0x8e);
+	setup_idt_entry(15,(u32)no_err_handler_15,0x08, 0x8e);
+	setup_idt_entry(16,(u32)no_err_handler_16,0x08, 0x8e);
+	setup_idt_entry(17,(u32)no_err_handler_17,0x08, 0x8e);
+	setup_idt_entry(18,(u32)no_err_handler_18,0x08, 0x8e);
+	setup_idt_entry(19,(u32)no_err_handler_19,0x08, 0x8e);
+	setup_idt_entry(20,(u32)no_err_handler_20,0x08, 0x8e);
+	setup_idt_entry(21,(u32)no_err_handler_21,0x08, 0x8e);
+	setup_idt_entry(22,(u32)no_err_handler_22,0x08, 0x8e);
+	setup_idt_entry(23,(u32)no_err_handler_23,0x08, 0x8e);
+	setup_idt_entry(24,(u32)no_err_handler_24,0x08, 0x8e);
+	setup_idt_entry(25,(u32)no_err_handler_25,0x08, 0x8e);
+	setup_idt_entry(26,(u32)no_err_handler_26,0x08, 0x8e);
+	setup_idt_entry(27,(u32)no_err_handler_27,0x08, 0x8e);
+	setup_idt_entry(28,(u32)no_err_handler_28,0x08, 0x8e);
+	setup_idt_entry(29,(u32)no_err_handler_29,0x08, 0x8e);
+	setup_idt_entry(30,(u32)no_err_handler_30,0x08, 0x8e);
+	setup_idt_entry(31,(u32)no_err_handler_31,0x08, 0x8e);
 
 	// Load IDT with all the new information in place, ready to use
 	load_idt();