Hi, Welcome to OpenStreetMap.

I've removed duplicated buildings and amended the existing building outlines to suit your new info. I amended some of the tagging of addresses and squared up some building outlines.

Regards Bernard.