Removed unneeded comment
Cleaned up containers.py and fixed a few bugs