code review from anne

Here is your code review - DO NOT MERGE!!!!   See # CR comments inline.