Tried to fix some bugs, created new ones. No more xml files fpr each collection.