Shaders: Everything added, but tuning needed