add_company and minor fixes