fix component collection, fix comparer