New invoicing amends

updating invoicing based on Char and Angus's content

@jamesshedden pls review / merge ta.