lots of minor changes