bunch of minor changes