full locs. listing, fixed name inconsistencies