buncha tweaks to fix my half-working orphan handling stuff