Patched some parts of combat and fixed a few warnings.