new calculations for $wage negotiation, and some fixes