more little container improvements