add orphan handling

this probably fixes a few synchronization issues you've noticed, but it's not sufficiently tested.

Even if it doesn't fix the one's you've noticed, it fixes ones that would exist if someone tried to make them happen.