+ added heat diffusion from upstream
+ minor adjustments