fix a pile of keymapping errors.