many bugfixes for Containers