More Bugfixes, Hotkey implementation