use vi keybindings
small adjustments