ENH+FIX: cleanup + make overwrite option happen