cleaned up and added hotkeys