fixes to heatmap and basic/ops