Renderer improvements, cleaning up