Renderer somewhat improved