Combat additions and fixes.