Some minor cleanups
Minor cleanups
Enabled more shaders