container progress, prototype fixes, cleanups