team and terms of service fixes