a little more work on the keymap