Final set of changes based on reviews.