Incorporate Carly's revisions

Make changes outright or add comments in the appropriate places