Fix and comments.