Shading improvements and debugging