across the board bug fixes and optimizations in collections/