updating keymap and fixing keymap