more keybinding changes, and other misc changes