Further improvments to the team system.