Rework of chapters, corrections