TOC, renaming, and other updates.