allow for missing city name for 605 522 xxxx
comment out randomizer
less random
consolidate a few mappings