Improved water-water and water-zeolite potentials for the simulation of structural and dynamical properties