work on container recipes

among other tweaks and housekeeping
Revert "work on container recipes"

This reverts commit 7027aa5b1fb86cdc6daec7942844b6e66cb87e50.