Small changes, moved "All done!" statement in the fix method