SegmentConnecting works now, various bug fixes