more fixes and links.