Links, fixes
Merge branch 'doc'