add cleanup and subfolder options