container - update docblocks, add some features