stubs for teams, structural fixes