Fix and add comments.