new generic container catchall, more deprecations, debugs