Tidied up uniform usage - no more spurious values
TODO: fix up textures too