fix some bugs
finish container scope