fix address, company & tar