slimmed down the container, bug fixes