ch.2 - minor details
merge