whew, margins on masonry and streams tweaked