Yeah, they switched it to holdem. Here's an obsessed fansite with more details.

1. This makes more sense. In the original novel, apparently Bond was some kind of "expert baccarat" player. Umm... bet on bank?

2. This is the high point of the cultural relevance of poker. Don't quit your day jobs.