Better performance and team info bugfix.