Some small tweaks to the restore command and standardizing on 'directory' instead of 'folder'