Fixes off my one error for Team info + tidy up