Consolidated code.
Also made fire less devistating.