moved map code into view_heatmap
map fixup callbacks now a little bit contained