Statistic improvements (heatmap and threat activation)