Make the rest of Meg's revisions

Transfer a few notes to comments