more keybindings, improved behavior