bunch of improvements in container building