Company name is now global
Bug fixes