I'm interested in your other updates, but I'm not sure I yet agree with your single-character mappings because of potential conflicts they could create.