fixed some bugs mainly about  flammability