lots of minor changes
lots of minor changes continued