a bunch of minor changes