fixes for issue #6: heatmap improvements