Reflecting @jenit comments

Picking up some of the comments @jenit made on the terms and
conditions. *Not* done a methodical check yet and will need to see it
rendered on the page.