some improvements to fire