make last edits before review, except some refinements TBD in examples