Re-enabled rest of OS, not all is working