Looks like you mapped them closer to their location based on bing images than I did. Looks v nice and ye no kidding this is hellishly complex as a layout.
Will close seeing as it all seems good. Tysm for your continued engagement and contributions on this note!