preserve ^X keybindings, and clean up a bit