TOC improvements, organization