+ improvements in chapters 1.1 and 1.2