Some bugfixes started adding container, need to fix lots more of the bugs