bh: the rest of Bob's edits.