Tweaked some team-related stuff