Auto-flag orphans & loose ends; did some double-event-firing bugfixing along the way