output-modules selectable via command line
cleaned up