Define the chapter structure, minor fixes