add InvoiceID, remove debug logging