More changes based on reviews.