fixed some issues with unitclass_id.