Updated Invoicing

Updated Invoicing
and some whitespace changes
Why?