Merge pull request #11 from nuked/master

Small updates to chapters 7 and 8.