exAA: call Marriott to make sure, but I think you should get points for the money you spend at the hotel - including upgrades, incidentals, etc. (You wouldn't get this at, say, a Courtyard, but you should at a Renaissance.)

TQ: Did you earn points on the Entertainment rate? I was originally going to do this stay with points, but changed my mind when I thought about how much I would be paying for upgrades when the $299 M11 Makapu rate was available. I switched to the $299 rate (I confirmed with the hotel - this rate DOES earn points). This will allow me to use my MR points in 2003 for a more-value-per-point package award.