More EditInvoice setup: Better Comments