added keyboard support
removing debugging pieces of code