export entity_info, minor tweaks