Fixed quite a few issues and removed quite a few un-needed containers.

Fixed quite a few issues and removed quite a few un-needed containers. #10