lots of minor updates.