changes to E and damage calculation for E, changes to combo