comment edit
cleanup in collections
should be in last commit