some sanity
Fix ch07/11
Merge branch 'latest'