text and a few edits.
merged