Fleshed out the shaders a bit