fixes from tom