further edits, mostly to figs