added in some masonry and wrap fixes