Added missing maps, added enddash, added underscore