lots of minor updates here and there.