fix bugs by getting all containers for check, and uncomment code from last commit that should not have been commented out