Tweaks to modes/key bindings