statistic & heatmap improvements