Add some more links, change formatting