7 chapter: small fixes