fixed more teambuilder bugs