masonry
minor fixes and code chore