whole bunch of minor improvements.