Made edits discussed in last week's CTS meeting