big ol pull, new toc and index layout