Terms and conditions fixes per code review