added comments with todos from review w/mary