Changes and fixes to incorporate another type of review.