Added containerNameFor(obj)
Several bug fixes