code review from anne

DON'T MERGE.  See CR... comments in code