all sorts of refactoring, adding content for later chapters, etc. More to come