keymap improvements