Added teams to output.
Added team to Excep and Html output.