Revised TIPS for simulations of liquid water and aqueous solutions