team and bugfixes