An Improved Polarflex Water Model