Minor fix and comments.