work over the last few months, various edits