Added links, various tweaks