max_collection_length, refactoring and working on no collection collections...