More inject insulation and enable heatmap rebase

Fixes #822