More defects resolved
Fixed invoice