Misc cleanup, more links.
Merge pull request #134 from jhannah/main

Misc cleanup, more links.