Fixed more links, but a few still remains