new key mappings and other changes