comments and changes continued.