Some final edits and keymap changes