more link fixes and reformatting
Merge branch 'working-pages' into gh-pages