fixed collaborator relations, added collaborator functionality