diff --git a/.update/version b/.update/version
index d62971817e..26e350ba72 100644
--- a/.update/version
+++ b/.update/version
@@ -1,7 +1,7 @@
 # Available DietPi version
 G_REMOTE_VERSION_CORE=7
 G_REMOTE_VERSION_SUB=0
-G_REMOTE_VERSION_RC=1
+G_REMOTE_VERSION_RC=2
 # Minimum DietPi version to allow update
 G_MIN_VERSION_CORE=6
 G_MIN_VERSION_SUB=-1
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 758cac7a16..16d9e1134e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,5 @@
 v7.0
-(2021-02-XX)
+(2021-02-28)
 
 Changes:
 - DietPi-Update | A new update check system has been implemented, which checks for a minimum required Debian and DietPi version and migrates systems with either too old Debian version or too old DietPi version to a different Git branch automatically. This especially smoothens the migration of our code base to newer Debian versions and the alternative branch can be used to inform and support Debian distribution upgrades and to upgrade the DietPi code to an intermediate version from where the system can be migrated back to the regular stable/master branch. Since this change required a new repository version file, we took the chance and incremented the DietPi core version to v7.0. This however has no further meaning, all previously supported DietPi and Debian versions remain supported and the change enables us to not require fresh image installs for major upgrades, like the upgrade from v159 to v6.0 did a few years ago.
diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software
index 5efcd6b64c..880b5a9fde 100644
--- a/dietpi/dietpi-software
+++ b/dietpi/dietpi-software
@@ -511,7 +511,7 @@ _EOF_
 		software_id=35
 
 		aSOFTWARE_NAME[$software_id]='Logitech Media Server'
-		aSOFTWARE_DESC[$software_id]='aka LMS, Squeezebox Server, SqueezeCenter, SlimServer'
+		aSOFTWARE_DESC[$software_id]='aka SlimServer, SqueezeCenter, Squeezebox Server'
 		aSOFTWARE_TYPE[$software_id]=0
 		aSOFTWARE_CATEGORY_INDEX[$software_id]=2
 		aSOFTWARE_ONLINEDOC_URL[$software_id]='https://dietpi.com/docs/software/media/#logitech-media-server'
@@ -1276,7 +1276,7 @@ _EOF_
 		software_id=137
 
 		aSOFTWARE_NAME[$software_id]='mjpg-streamer'
-		aSOFTWARE_DESC[$software_id]='Steam JPEG frames from various sources to various possible outputs'
+		aSOFTWARE_DESC[$software_id]='Simple camera streaming tool with HTML plugin'
 		aSOFTWARE_TYPE[$software_id]=0
 		aSOFTWARE_CATEGORY_INDEX[$software_id]=7
 		aSOFTWARE_ONLINEDOC_URL[$software_id]='https://dietpi.com/docs/software/camera/#mjpg-streamer'
@@ -1353,7 +1353,7 @@ _EOF_
 		software_id=134
 
 		aSOFTWARE_NAME[$software_id]='Docker Compose'
-		aSOFTWARE_DESC[$software_id]='Tool to defining and run multi-container Docker applications'
+		aSOFTWARE_DESC[$software_id]='Manage multi-container Docker applications'
 		aSOFTWARE_TYPE[$software_id]=0
 		aSOFTWARE_CATEGORY_INDEX[$software_id]=8
 		aSOFTWARE_ONLINEDOC_URL[$software_id]='https://dietpi.com/docs/software/programming/#docker-compose'
@@ -5603,7 +5603,7 @@ Package: wireguard wireguard-dkms wireguard-tools\nPin: release n=bullseye\nPin-
 			# Build dependencies
 			DEPS_LIST='make cmake gcc libc6-dev libjpeg-dev'
 			# - On RPi, add RPi Camera support by default
-			(( $G_HW_MODEL > 9 )) || DEPS_LIST+='libraspberrypi-dev'
+			(( $G_HW_MODEL > 9 )) || DEPS_LIST+=' libraspberrypi-dev'
 
 			# Download sources
 			Download_Install 'https://github.com/jacksonliam/mjpg-streamer/archive/master.tar.gz'
@@ -16585,7 +16585,7 @@ _EOF_
 
 			G_WHIP_SIZE_X_MAX=95 # Assure this is enough to show full software descriptions + scroll bar
 			G_WHIP_BUTTON_CANCEL_TEXT='Back'
-			G_WHIP_CHECKLIST "Please use the spacebar to select the software you wish to install.\n - Software and usage details: https://dietpi.com/software
+			G_WHIP_CHECKLIST "Please use the spacebar to select the software you wish to install.\n - Software and usage details: https://dietpi.com/docs/software/
  - NB: Pressing 'ESC' or selecting 'Back' will clear all changed selections"
 
 			# Reset Choices made flag
@@ -16594,15 +16594,10 @@ _EOF_
 			# Check for matching results (selected items)
 			for i in $G_WHIP_RETURNED_VALUE
 			do
-
 				# Enable
-				if disable_error=1 G_CHECK_VALIDINT "$i" && (( ${aSOFTWARE_INSTALL_STATE[$i]} == 0 )); then
-
-					INSTALL_SOFTWARE_CHOICESMADE=1
-					aSOFTWARE_INSTALL_STATE[$i]=1
-
-				fi
-
+				(( ${aSOFTWARE_INSTALL_STATE[$i]} == 0 )) || continue
+				INSTALL_SOFTWARE_CHOICESMADE=1
+				aSOFTWARE_INSTALL_STATE[$i]=1
 			done
 
 			#-----------------------------------------------------------------------------
diff --git a/dietpi/func/dietpi-globals b/dietpi/func/dietpi-globals
index a5cb3b1cb6..4a16b874f2 100644
--- a/dietpi/func/dietpi-globals
+++ b/dietpi/func/dietpi-globals
@@ -66,7 +66,7 @@
 	# - Assign defaults/code version as fallback
 	[[ $G_DIETPI_VERSION_CORE ]] || G_DIETPI_VERSION_CORE=7
 	[[ $G_DIETPI_VERSION_SUB ]] || G_DIETPI_VERSION_SUB=0
-	[[ $G_DIETPI_VERSION_RC ]] || G_DIETPI_VERSION_RC=1
+	[[ $G_DIETPI_VERSION_RC ]] || G_DIETPI_VERSION_RC=2
 	[[ $G_GITBRANCH ]] || G_GITBRANCH='master'
 	[[ $G_GITOWNER ]] || G_GITOWNER='MichaIng'
 	# - Save current version and Git branch