Some combat tweaks + backup before modifying action system.