improve TOC, some fixes