remove mistakes from 2-7. refactor 2-8, 2-9.