keyboard inputs tidied up a bit, fixed some issues.