Fixed some compilation errors and added some hotkeys