Contain fix, subgraph adjustment

Multi-stage subgraph cull still buggy