minor tweaks to the container