Hi Rosemarie.
Sounds like you're on the right track. You've already taken all the recommended basic measures to avoid/fight water retention:

Upping your water intake (although you could up it even more.)
Taking cal/mag/potas supplements.
Cutting down on salty foods (porkrinds, cheese, bacon etc.)
Exercising.

You ought to see some results soon.

If you have a stubborn water retention/oedema, you might want to try some dandelion tea, which is a mild diuretic. Not too often though.