company: some more tweaks