Fixed some issues, added rudimentary keyboard support for testing only.