lots of minor updates