Invoice changes

Please consider adding the following changes.
Thanks.