added remove clause
fixed bug with the fire