improvements, added proforma invoice support