My 325 sedan had huge water spots all over the passenger side. After some research I found out that vinegar removes the stains. I spent the day making my car smell like a pickle, but it was so worth it. The stains came right of. I then used scratch X to remove the water etching and that worked like a charm too! I used some meguiars carnauba wax plus and now it looks awesome.