bug fixes

Fixed up some issues with heatmap state not being communicated to all
objects.