a bit of a tidy up, renamed fire_max