add company and link to contact, cleanup