p 216 minor changes
new p: 228, 232
minor changes
new p: 241