Minor fixing and comment modifications