Rewrite parts, fix lingering circles.