bunch of minor updates