added team names fixed some bugs