Improving mosaic naming + bug corrections.