Improving Theoretical Modeling Of Water In Condensed Phases