Fix team players and add average