More fixes to links and attribution