Finally got back to the building complex and did some more careful surveying, took mapillary pictures etc. Have now split building in two and added the address details for each block of flats. Drew in some grass areas and trees as well that I captured on my video.