ShaderMaterial and some small changes