bug fixes and trading name support