Clean up the combat code a little bit and healing as well.

Still needs work but this is a small improvement.