adding rest of chapters, and some more renaming