Seems you have it sorted? Worth noting, however, as VAP says, if you are trying to defrag the system disk or a drive which has 'calls' to it like screensaver, email checks, etc, it will continually 'restart' the defrag and take for ever. Hence 'Safe' mode.
For the experts - I thought that MS 'hotfixes' and updates could be moved once installed?? Is that correct?