#293 -- more toc tweaks