Made som updates on the H2O calculation.