Lets fix some links and stuff