Edits from beta testing, add in collection-tree