Resolved some issues with Frozen! waypoints (still not perfect but much better)