more updates to templates and invoices