bug fixes + keybinding