diff --git a/dev/debug_obackup.sh b/dev/debug_obackup.sh
index cc6ac67..bd68559 100755
--- a/dev/debug_obackup.sh
+++ b/dev/debug_obackup.sh
@@ -7,7 +7,7 @@ PROGRAM="obackup"
 AUTHOR="(C) 2013-2017 by Orsiris de Jong"
 CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
 PROGRAM_VERSION=2.1-beta5
-PROGRAM_BUILD=2018083003
+PROGRAM_BUILD=2018083005
 IS_STABLE=no
 
 #### Execution order					#__WITH_PARANOIA_DEBUG
@@ -4151,7 +4151,7 @@ function DecryptFiles {
 function Rsync {
 	local sourceDir="${1}"		# Source directory
 	local destinationDir="${2}"	# Destination directory
-	local recursive="${2:-true}"	# Backup only files at toplevel of directory
+	local recursive="${3:-true}"	# Backup only files at toplevel of directory
 
 	__CheckArguments 3 $# "$@"    #__WITH_PARANOIA_DEBUG
 
@@ -4166,9 +4166,6 @@ function Rsync {
 		RSYNC_NO_RECURSE_ARGS=""
 	fi
 
-	Logger "Beginning file backup of [$sourceDir] to [$destinationDir]." "VERBOSE"
-
-
 	# Creating subdirectories because rsync cannot handle multiple subdirectory creation
 	if [ "$BACKUP_TYPE" == "local" ]; then
 		_CreateDirectoryLocal "$destinationDir"
@@ -4227,7 +4224,7 @@ function FilesBackup {
 			encryptDir="$FILE_STORAGE"
 		fi
 
-		Logger "Beginning backup task [$backupTask]." "NOTICE"
+		Logger "Beginning file backup of [$sourceDir] to [$destinationDir] as $BACKUP_TYPE backup." "NOTICE"
 		if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then
 			EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" true true
 			if [ $? -eq 0 ]; then
@@ -4263,7 +4260,7 @@ function FilesBackup {
 			encryptDir="$FILE_STORAGE"
 		fi
 
-		Logger "Beginning backup task [$backupTask]." "NOTICE"
+		Logger "Beginning file backup of [$sourceDir] to [$destinationDir] as $BACKUP_TYPE backup." "NOTICE"
 		if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then
 			EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" false true
 			if [ $? -eq 0 ]; then
@@ -4298,7 +4295,7 @@ function FilesBackup {
 			encryptDir="$FILE_STORAGE"
 		fi
 
-		Logger "Beginning backup task [$backupTask]." "NOTICE"
+		Logger "Beginning file backup of [$sourceDir] to [$destinationDir] as $BACKUP_TYPE backup." "NOTICE"
 		if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then
 			EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" true true
 			if [ $? -eq 0 ]; then
diff --git a/obackup.sh b/obackup.sh
index 1c5efe1..46a86dd 100755
--- a/obackup.sh
+++ b/obackup.sh
@@ -7,7 +7,7 @@ PROGRAM="obackup"
 AUTHOR="(C) 2013-2017 by Orsiris de Jong"
 CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
 PROGRAM_VERSION=2.1-beta5
-PROGRAM_BUILD=2018083003
+PROGRAM_BUILD=2018083005
 IS_STABLE=no
 
 
@@ -3945,7 +3945,7 @@ function DecryptFiles {
 function Rsync {
 	local sourceDir="${1}"		# Source directory
 	local destinationDir="${2}"	# Destination directory
-	local recursive="${2:-true}"	# Backup only files at toplevel of directory
+	local recursive="${3:-true}"	# Backup only files at toplevel of directory
 
 
 	local rsyncCmd
@@ -3959,9 +3959,6 @@ function Rsync {
 		RSYNC_NO_RECURSE_ARGS=""
 	fi
 
-	Logger "Beginning file backup of [$sourceDir] to [$destinationDir]." "VERBOSE"
-
-
 	# Creating subdirectories because rsync cannot handle multiple subdirectory creation
 	if [ "$BACKUP_TYPE" == "local" ]; then
 		_CreateDirectoryLocal "$destinationDir"
@@ -4019,7 +4016,7 @@ function FilesBackup {
 			encryptDir="$FILE_STORAGE"
 		fi
 
-		Logger "Beginning backup task [$backupTask]." "NOTICE"
+		Logger "Beginning file backup of [$sourceDir] to [$destinationDir] as $BACKUP_TYPE backup." "NOTICE"
 		if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then
 			EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" true true
 			if [ $? -eq 0 ]; then
@@ -4055,7 +4052,7 @@ function FilesBackup {
 			encryptDir="$FILE_STORAGE"
 		fi
 
-		Logger "Beginning backup task [$backupTask]." "NOTICE"
+		Logger "Beginning file backup of [$sourceDir] to [$destinationDir] as $BACKUP_TYPE backup." "NOTICE"
 		if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then
 			EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" false true
 			if [ $? -eq 0 ]; then
@@ -4090,7 +4087,7 @@ function FilesBackup {
 			encryptDir="$FILE_STORAGE"
 		fi
 
-		Logger "Beginning backup task [$backupTask]." "NOTICE"
+		Logger "Beginning file backup of [$sourceDir] to [$destinationDir] as $BACKUP_TYPE backup." "NOTICE"
 		if [ "$ENCRYPTION" == "yes" ] && ([ "$BACKUP_TYPE" == "local" ] || [ "$BACKUP_TYPE" == "push" ]); then
 			EncryptFiles "$backupTask" "$CRYPT_STORAGE" "$GPG_RECIPIENT" true true
 			if [ $? -eq 0 ]; then