add company and fix bugs