Enemy combatants are now uniquely identified

Fixes #187