Chap 4 review plus many other minor changes.