Added missing operators.
Forced uniforms to load each time.
Fixed merge.