New soft cost form, and new merge fields for invoices.