Add ability to highlight specific arcs; more fine-tuning of waypoints.