toc improvements