White vinegar will dissolve most water spots and leave glass extremely shiny. Very stubborn marks may be calcium deposits or etches on the surface of the glass. CLR will remove the calcium, and if the scratches are not too severe, rubbing with a paste made of baking soda and water will polish them off.