code review from anne DON'T MERGE

See code review file and #CR comments.

I don't do GIFs!!!  Sorry.  Life isn't fair.