a lot of minor changes