more fixes for costing