Corrected some problems in the calculation of energy within the thermal_propeties.py program. Be carful with this as some of these calculations/labels are only valid in certin parameter regimes.