upgraded company-mode