Tidy some keybindings and add a few things.