Name containers and clean up after ourselves. Fixes #85 and #112