Moved some bits out of the conclusion; a couple of minor edits
merge