containers comments and FIXME