Edits from Danny.  Minor tweaks.