Fixed shader bugs with uniforms ready for release