Added Debug and Keyboard
Tidying up