Fix calculating total cost of extra costs

- Fix calculating total cost of extra costs
Upgrade total costs