final pass on entities import/export/overlays working as well as production