Fixed a bug related to removing old heatmaps
Heatmap working, most bugs fixed