Reviewing chapter 2

Please, see "TODO" comments
Reviewing chapter 3

It's OK but should be improved.
See "TODO" comments.