misc changes

mostly to Chapter6