Keyhandler + Init fix