more housekeeping, and keymaps