Updated collection with multiple fixes #78

Closed tftd closed 3 days ago