cleaning up remaining inconsistencies
adding fire logic