further broken links, cleanup