Added teams, cleaned some stuff.