Added clock and keyboard interrupts