re-apply more misc changes that have since been overwritten by merging of PRs

and fix a couple of links.