Various fixes in Chapter 11
Merge pull request #20 from canibanoglu/chapter11

Various fixes in Chapter 11 courtesy of @canibanoglu