Finish (except testing) CollectionObjects, miscellaneous minor fixes