Fixes to some things, issues with key input detected