Bug/better hotkey and event support