commentes and minor changes continued.