More improvents to comment.