more work on hotkeys