Many edits, including Jamie's and Gregory's further suggestions.