Couple cosmetic changes from review.