First round of changes after review.