many improvements to team tracking