finished edits based on Jaime's comments