Fixing some container bugs. IN PROGRESS