Various changes and updates after review.