I had some pretty bad
water spots which I just got out this morning with
Sonus Glass & Chrome Polish. Worked really well, I tried all kinds of stuff to get them off (vinegar, almost every otc glass cleaner I could find, etc), but the Sonus was the only one that worked.