Combat fixed

No aggressively tested, but hey-- it seems to work great