improvements; added function to get team
merged