Invoice generation improved, more info in invoice for better accountability