some performance improvements on the charts