Improving Moist Thermodynamics in Weather and Climate Models