Geneva II

This article does a reasonable job outlining the trouble military lawyers had giving guidance on what was and what was not permissible in Iraq and Afghanistan. Ultimately, it recommends rewriting Geneva, and talks about how greater transparency will help make things better. It does not think about incentives, however, which is where Geneva was remarkably clear-headed and wise: if you do not follow the laws of war, you are not afforded the protection the laws of war may offer.

What's left then, is a question of how to manage public relations and propaganda, which is a different question entirely.