cleanup, add links, some code fixes, proofing