dave's edits to ch 6, completes dave's edits