General fixes

-Better costs to follow