ch2 almost completed
Merge branch 'mac'
fix typo and del trailing blanks
2_78
ch3, 54-61