Fire functionality

Extended the functionality to include fire. Also fixed up a lot of
errors from my sloppy coding last night. Have setup framework for
analysing burn across the board.