Changes in first 2 chapters, based on the Christian's comments.