fixed lang-table support and migrated unit 7