More tweaks, mostly to content

I think this is ready to ship --- thanks very much once again!