Fixed some bad links
merge