Add some links and tidy up a little.