fix double heatmap and rare anim issues, close #2