More links, formatting fixes