more toc fixes
Merge pull request #988 from pennij/working

more toc fixes