The text of Senator Dodd's bill, which I mentioned last week. And if you haven't followed the changes the MCA made to the law, here's
a discussion of how the MCA changed the law and the effect Dodd's bill would have on specific provisions of the MCA. As one of the comments points out, the only thing the bill doesn't address is the MCA provisions that bar prosecution of government employees for violations of Geneva. But all in all, I'm happy with the bill.
Give it a read: it's short, sweet, and to the point. There's also an interesting final section which sets up an expedited procedure for the courts to hear constitutional attacks on the MCA: it provides for the DC district court to hear such claims, with a rapid appeal of right to the Supreme Court. (Most appeals to the SC are at the Court's discretion.)