What glass cleaner/cream for water spots?

[Paul_S]

Does anyone know of and has used a good deep cleaning glass cleaner for water spots? I've been looking at some cream type cleaners that sound OK, but I'm not sure what I can find in the local parts store or which is best. I have some original glass that looks beautiful, but at the right angle in the sun the water spots show. So far all I've used is windex and a 50-50 water vinegar mix. Any cleaning info or light polishing tricks (if there are any) would be great.

Thanks, Paul