fixes from the review.