update to turn more fields into invoice object values