fix up containers; setup more for snapshot