Team changes

Just minor changes to code related to teams