handle orphans in reinitialization, and increase default limit