company class added, cleared some bugs