Add commas in city names, add space between dashes in dates