Miscellaneous container doc/code improvements