long list of minor changes