Fixed an issue, and completed custom hotkeys