toc and anchor link fixes
fixing merge conflict #1003
Merge pull request #1003 from pennij/working

toc and anchor link fixes