Added the option for custom output-containers. I also standardized a few things.