Remove broken links from docs and pull in some changes from wiki