Shaders improvements (still errors)