Improvements to the render