Added last remaining comments
First round of edits for the next draft