Deflagration + collisions, encore incomplet + bugs

Signed-off-by: jalhally <jobrann@hotmail.com>