Minor updates to CW edits.