Adjusted AnnotationManager.
Cleaned up ConsortSegmentMaker.