lots of container cleanups (much docs/todo notes)