fixed some messed up combat strings, I think. Watch for stuff that doesn't look right.