toc revisited and detailed plus some fixes, chapter 2 almost finished