Added chaper 7 and 11. And some small fixes