Did the review problems, fixed minor errors