Finished TOC, chapters
last changes in 7
last fixes to merge