- Fixed a few more general bugs with container.