Some more cleanup
Fixing some more stuff
Fixed shaders