Specs for team form
Minor changes