Final (?) changes to monthlyinvoice