Bug fixes and updates to make sure the Invoice is being saved