Rendering improvements