small fixes in chap1 and chap2