Do they offer nice upgrades through FSPP? Or is it just a single upgrade?

The St. Regis really has issues with cleanliness.
First stay: White stains on the bedspread (didn't take a lot of imaginaion what they were from - ugh!). They were apologetic and offered a free dinner, but I didn't have time for that. I think I didn't even request points. Just had them exchange the bedspread, which they did promptly.
Second stay: Lots of stains from glasses on surfaces, dust, breadcrumbs. They duty manager said they'd deep-clean the suite while I was gone. When I came back, it wasn't much better. They claimed they had tried to remove the stains, but that it wasn't possible. Well, then you better replace the side table. What a strange answer. The dust also wasn't gone.
Upgraded to a John Jacob Astor Suite as compensation (which really was too large if such a thing exists) - no hot water. Had to call for them to turn it on, which took 5-10 minutes. Same issue the following morning. Spoke to the Director of Rooms when we checked out and also mentioned our issues during our first stay. So they really can't claim they don't know about these problems.

When a friend stayed a few weeks later, he found a hair in his shower and I believe there were some other things that weren't cleaned well, too.
It really is a shame because the hardware and the views from the suites (all suites are corner suites, as far as I know) are phenomenal.

I'm leaning towards staying there again despite these issues, but it's really such a shame. It's such a stunning hotel.
The only other slight negative about the hotel is that the breakfast restaurant is quite small. I couldn't exactly pinpoint anything I was missing from the breakfast buffet, but the buffet is a fraction of what the Le Meridien offers, for example.
The room itself is also rather small. But that's really a minor detail. I hope they can fix the cleanliness issues.