resolved never ending damage loops and leaks