many additional comments (javadoc style for classes); merged SegmentSource and SegmentCollection; bugfixes in server api