Corrected consumption stuff and total calculation