More bug fixing, some day we shall have a burn effect