Improved output, added teams