Added folder cleanup and display on finish.