Fixes issues and continues updated relating to TypeTable hash