latest masonry setup and explore fixes