improvements: more user-friendly hotkeys