Updated demo and improved hotkey unbinding