Fix 21 errors, complete chapter 7 homework