Enemies killing each other fixed

Enemies killing each ther has been fixed. Nevertheless will have to
revisit the "unit" logic anyways, since it is becoming too convoluted
and we don't know exactly what we want to do.