more edits based on andrea's responses