Combo improving + raping fixes
Revert "Combo improving + raping fixes"

This reverts commit 3765944ea0cc842433036b00b2cc50633196d74c.
Revert "Revert "Combo improving + raping fixes""

This reverts commit dbe162cff364d080a0c571fb81ab8896e01bea76.