Fixed a bunch of broken links
Fixed merge issue