locator maps and a whole load of other stuff
merge resolution
missing commas
final fixes