Bug Fixes, appropriate management of invoices