Renderer improvements

@lennartcl