self-containment and fixes