added teamnames and perfected several methods