Final touches on the comments