for water spots id try a half and half mix of white vinegar with distilled water, and adjust the ratio towards more vinegar until its just all vinegar, if it doesnt come off with that, then you have etching which will need a compound, try swirlx if that doesnt work scratchx2.0 if that doesnt...