included ContourTracker, made other enhancements