container/wrapper tweaks