Chapter 3 changes

lots of small improvements
Merge pull request #365 from shaitanelnifi/master

Chapter 3 changes