Code review comment for lp:~tintou/scratch/scratch-backup-changes

Lucas: I fixed most inline comment you did, but most of the code is just copy/paste from older functions so it's not the scope of this branch to change all the behavior and strings :)