rejiggering some key mappings