Add output folder & fixed percentage problem