Fixed tracking issues

Also finished auto uniform loading for shaders