Bugfix in Step5, plus addition of a cleaning step at the end of the wrapper to make the output directory less confusing