Content improvements and add a TOC