Fixed the shaders, but still a few bugs