applied the patches from the review.