Adding control point viz for troubleshooting arcs; other cleanup.