Minor fix and commentaries