Minor keypress fixes, mostly works, little sketchy and should do more safety checks :)