diff --git a/kernel-rs/src/arch/x86/mod.rs b/kernel-rs/src/arch/x86/mod.rs
index 887c6d18..bef3cee1 100644
--- a/kernel-rs/src/arch/x86/mod.rs
+++ b/kernel-rs/src/arch/x86/mod.rs
@@ -26,8 +26,6 @@ pub unsafe extern fn x86_rust_start(multiboot_info_addr: usize) {
     // set up physical allocator
      ::memory::init(&boot_info);
 
-    // pic
-    self::device::init();
 
     // set up interrupts
     self::interrupt::init();
@@ -38,6 +36,9 @@ pub unsafe extern fn x86_rust_start(multiboot_info_addr: usize) {
     // set up heap
     ::allocator::init(&mut active_table);
 
+    // pic
+    self::device::init();
+
     // after core has loaded
     ::memory::init_noncore();
 
diff --git a/kernel-rs/src/lib.rs b/kernel-rs/src/lib.rs
index 34129b8a..f4dc049a 100644
--- a/kernel-rs/src/lib.rs
+++ b/kernel-rs/src/lib.rs
@@ -29,7 +29,7 @@ extern crate x86;
 pub mod keyboard;
 /// simplisitc kernel commands
 pub mod console;
-/// rust wrappers around cpu I/O instructions.
+/// rust wrappers around cpu I/O instructions., cpuio.rs needs to go in favour of io module
 pub mod cpuio;
 pub mod io;
 /// ACPI self contained module
diff --git a/kernel-rs/x86 b/kernel-rs/x86
index 3cef2945..ea8512f4 160000
--- a/kernel-rs/x86
+++ b/kernel-rs/x86
@@ -1 +1 @@
-Subproject commit 3cef2945c884857a6ef44c942a3d949790792db7
+Subproject commit ea8512f4c21c6c84578e04eff1f0b4662f089cd9