fixing links, etc