Improvements in contour spine construction. But we broke the tracking.
Needs still fixes in the tracking part.