code review from anne

See comments in the code_review.md file and inline tagged with #CR