Merging in MCF's edits
Edits based on pre-submission feedback from Francisco, Steve, and the FLA group.