More work completed on heatmap.
Slight fixes