Fixing links, LOTS of links

Adhoc at the moment. Make sure to make sense of the madness later with
better naming system.