fixes from review.