Corrected bugs; let the user choose whether to clean up