Corrected 3D shader and misc