Reviewing chapter 2

Please, see "TODO" comments