water spots

the best way I've found is with fine steel wool and liquid car wax. It will not scratch the glass and takes every blemish off.