more edits based on Duff's comments and phone conversation