My favorite cleaners include
SeaPower cleaner wax
Biobore
Davis Fiberglass stain remover gel
If the waterspots are on tempered glass, ammonia can be tried. From there work up to BonAmi cleanser, Barkeepers Friend (has oxalis acid).
Always flush with lots of water and keep things waxed.