Various small tweaks, responding to comments from Adi/Lou.
Probably I still need to cut out the last paragraph.