tidy up, add C-: keymap