many more changes

started edit of chapter 2
more small changes in several chapters
merged amy's comments to chapters 1+2