Added team sports stuff and tidy up