Fixed a few bugs, starting on shaders