smal fixes
solved conflict
Fixed bug in SegmentBySegment.py

Did same error as Andy. Changed phaseX to phaseY
Removed TODOs