Fixed chapter 2 parsing problems but not yet the versions history - need...

...s discussion on how to fix it :)