And I still think Jack's enrolled in the Crichton school of planning. Not sure if that's better or worse than the Angel school.
I'm fairly sure they're all housed together in the University of Title Characters Can't Die (Permanently).
The thing I don't get is, why didn't Dina (pretty sure that's how the show spells it) remember that Marwan already put out a hit on her? And explain that to CTU, re: why their plan would never work? Unless she really was just trying to get Jack killed, in which case she should have shot him in the head. (With what we all knew was an empty chamber, thus still leaving him alive but making a LOT more sense.)