lots of bug fixes for collection, most tests pass cept for slick ones