cleanup inner shader classes, and minor tweaks