Add util/wasted heat and remove discrepancies between the models