Fix incorrect names for hotkeys and some small improvements