Dipole preserving and polarization consistent charges.

Dipole preserving and polarization consistent charges.