fixes
Merge branch 'ch11'