Various minor cleanup. Doc improvements. Normalize a few more keybindings.