Circular Blocking

Decided anyway to stikc with circular bounding shapes for bldgs and
units for now.
Tweaked it.