Add links, some fixes