upgrade CCC
some more charting improvements