Improved combo logic and damage calcs