Invoicing enhancements. Fixes #17