Revise main text, most changes to discussion.