Finished first round of edits