Fixed heatmap null issues. Leaned output.