Collections:
 Merge duplicates
 Various refinements
Various fixes