Some other fixes, the toc is completely not ok