Invoicing, run refactored. (minor invoice change)