added container linking step defs, bugfixing