various edits, mostly minor, and mostly in 4.2