incorporated David's edits and other minor changes.