container with to 95%
some bugs fixed