refactoring, change from description to collection_id for grouping,
plotting improvements