fix some links
Merge branch 's-hist' into staging2