numerous key mapping changes and additions