rework tess entity import + fixes