Fix a ton of broken linkage.
Fix some more links.
Too much duplication of stuff.