Minor fix and more commenting