Fixes, cleanup, and resilliency.