various fixes especially for edge review
initial add of containers