Improved water physics