updated minor edits

My line edits.
I'll let Arrielle's get in and then I'll fix the conflicts.