Reworked chapter organization

+ minor fixes