minor
reviewed ch5, ch6 in progress