Structure of liquid water. II. Improved statistical thermodynamic treatment and implications of a cluster model