May have fixed the shader issues.

Pending feedback from group.