Add invoice, Fix bug