Small edits per comments.