Fixed an issue with the chart data (and some other improvements)