#293 -- more toc fixes (mostly cosmetic)