Pulled in the rest of the comment changes