a whole bunch of minor updates