new keybindings and cleanup