comments and minor changes continued.