Misc Changes, including keymap related stuff