More improvements to the rendering