Reconsidering the military bill

Would somebody please point me to a source where I can get a straight answer on two issues related to this "torture"/"habeas corpus" bill we've been arguing about? Here's what I want to know:

1. What interrogation techniques will be allowed under this bill? Will waterboarding be allowed? (I've been going on and on about how it will be permitted in some instances, but to be honest, I'm now confused, and doubting that that's the case.) How much latitude does the president have to define which techniques are okay to use? I ask because it's fine to say that it bans "torture," but not if President Bush gets to define the meaning of torture.

2. Who loses his habeas corpus rights under this bill? If, as I believe SCOTUS declared, enemy combatants have statutory (as distinct from constitutional) rights to challenge their detention, will they still have them if this bill is signed into law? Will it be possible that someone will be thrown in jail indefinitely, with no opportunity to have his case reviewed, or to challenge evidence against him? The NYTimes editorial board says: "All Mr. Bush would have to do to lock anyone up forever is to declare him an illegal combatant and not have a trial." Is that true?