various changes to TOC and index