Tweaked a compule of key mappings