Fix
Fix ordering
Oops, dropped uniforms
Fixup whitespace
Switch to a class instead of macros
Reorder, and some fixups