Finished second round of edits
Right before Pierre's 3rd review