Adding hyperlinks, fixing headers