Further initial edits.