Combo tweaks

Made total combo add a small amount to the punch/heal combos, and made the first punch properly non-ranged again.