improvements to the basic container examples