toc fixes
toc fixes
Merge pull request #986 from pennij/working

TOC fixes - first batch