a lot of minor updates