If you'd rather not revert, I'll try to fix all this in the next day or two. I'll merge the two buildings in to one and give my best shot at mapping the ground floor businesses that seem to ignore the building footprint. But that may take time. Sorry for biting off so much more than I was ready for!