added metatdata to containers ; fixed initial setup bug
Merge branch 'meta-data'