diff --git a/compile.sh b/compile.sh
index 1f72ba823..a29707729 100755
--- a/compile.sh
+++ b/compile.sh
@@ -9,6 +9,10 @@
 # This file is a part of the Armbian build script
 # https://github.com/armbian/build/
 
+# DO NOT EDIT THIS FILE
+# use configuration files like config-default.conf to set the build configuration
+# check Armbian documentation for more info
+
 SRC=$(dirname $(realpath ${BASH_SOURCE}))
 # fallback for Trusty
 [[ -z $SRC ]] && SRC=$(pwd)
diff --git a/lib/distributions.sh b/lib/distributions.sh
index 4dc8414c9..87f0e2a43 100644
--- a/lib/distributions.sh
+++ b/lib/distributions.sh
@@ -101,17 +101,11 @@ install_common()
 	display_alert "Installing u-boot" "$CHOSEN_UBOOT" "info"
 	chroot $SDCARD /bin/bash -c "DEVICE=/dev/null dpkg -i /tmp/debs/${CHOSEN_UBOOT}_${REVISION}_${ARCH}.deb" >> $DEST/debug/install.log 2>&1
 
-	if [[ $INSTALL_HEADERS == "yes" ]]; then
+	if [[ $INSTALL_HEADERS == yes ]]; then
 		display_alert "Installing headers" "${CHOSEN_KERNEL/image/headers}" "info"
 		chroot $SDCARD /bin/bash -c "dpkg -i /tmp/debs/${CHOSEN_KERNEL/image/headers}_${REVISION}_${ARCH}.deb" >> $DEST/debug/install.log 2>&1
 	fi
 
-	# install firmware
-	#if [[ -f $SDCARD/tmp/debs/${CHOSEN_KERNEL/image/firmware-image}_${REVISION}_${ARCH}.deb ]]; then
-	#	display_alert "Installing firmware" "${CHOSEN_KERNEL/image/firmware-image}" "info"
-	#	chroot $SDCARD /bin/bash -c "dpkg -i /tmp/debs/${CHOSEN_KERNEL/image/firmware-image}_${REVISION}_${ARCH}.deb" >> $DEST/debug/install.log 2>&1
-	#fi
-
 	if [[ -f $SDCARD/tmp/debs/armbian-firmware_${REVISION}_${ARCH}.deb ]]; then
 		display_alert "Installing generic firmware" "armbian-firmware" "info"
 		chroot $SDCARD /bin/bash -c "dpkg -i /tmp/debs/armbian-firmware_${REVISION}_${ARCH}.deb" >> $DEST/debug/install.log 2>&1
diff --git a/packages/bsp/common/etc/update-motd.d/10-header b/packages/bsp/common/etc/update-motd.d/10-header
index 2c8bc06ab..c2ad1e48c 100755
--- a/packages/bsp/common/etc/update-motd.d/10-header
+++ b/packages/bsp/common/etc/update-motd.d/10-header
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# DO NOT EDIT THIS FILE
+# any changes will be lost on board support package update
+
 THIS_SCRIPT="header"
 MOTD_DISABLE=""
 
diff --git a/packages/bsp/common/etc/update-motd.d/35-tips b/packages/bsp/common/etc/update-motd.d/35-tips
index b6c7e4b6a..d7df7fe5e 100755
--- a/packages/bsp/common/etc/update-motd.d/35-tips
+++ b/packages/bsp/common/etc/update-motd.d/35-tips
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# DO NOT EDIT THIS FILE
+# any changes will be lost on board support package update
+
 THIS_SCRIPT="tips"
 MOTD_DISABLE=""
 
@@ -11,7 +14,6 @@ done
 
 quotes="/etc/update-motd.d/quotes.txt"
 if [[ -f $quotes ]]; then
-
         random_line=$(shuf -i 1-$(wc -l < $quotes) -n 1)
         quote=$(sed -n -e "$random_line"p $quotes)
         [[ -n $quote ]] && echo -e "\e[93mTip of the day:\e[39m $quote\n"
diff --git a/packages/bsp/common/etc/update-motd.d/40-updates b/packages/bsp/common/etc/update-motd.d/40-updates
index 7c63f93a1..a373513ab 100755
--- a/packages/bsp/common/etc/update-motd.d/40-updates
+++ b/packages/bsp/common/etc/update-motd.d/40-updates
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# DO NOT EDIT THIS FILE
+# any changes will be lost on board support package update
+
 THIS_SCRIPT="updates"
 MOTD_DISABLE=""
 
diff --git a/packages/bsp/common/etc/update-motd.d/41-armbian-config b/packages/bsp/common/etc/update-motd.d/41-armbian-config
index e502b8c86..7eedf7db5 100755
--- a/packages/bsp/common/etc/update-motd.d/41-armbian-config
+++ b/packages/bsp/common/etc/update-motd.d/41-armbian-config
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# DO NOT EDIT THIS FILE
+# any changes will be lost on board support package update
+
 THIS_SCRIPT="armbian-config"
 MOTD_DISABLE=""
 
@@ -9,4 +12,4 @@ for f in $MOTD_DISABLE; do
 	[[ $f == $THIS_SCRIPT ]] && exit 0
 done
 
-echo -e "[\e[31m General system configuration\e[0m: \e[1marmbian-config\e[0m ]"
+[[ $(( $RANDOM % 2 )) == 0 ]] && echo -e "[\e[31m General system configuration\e[0m: \e[1marmbian-config\e[0m ]\n"
diff --git a/packages/bsp/common/etc/update-motd.d/98-autoreboot-warn b/packages/bsp/common/etc/update-motd.d/98-autoreboot-warn
index 826c1ecfb..2aa3b1293 100755
--- a/packages/bsp/common/etc/update-motd.d/98-autoreboot-warn
+++ b/packages/bsp/common/etc/update-motd.d/98-autoreboot-warn
@@ -1,7 +1,9 @@
 #!/bin/bash
 
+# DO NOT EDIT THIS FILE
+# any changes will be lost on board support package update
+
 if [[ -f /var/run/resize2fs-reboot ]]; then
-	printf "\n\e[0;91mWarning: a reboot is needed to finish resizing the filesystem \x1B[0m \n"
-	printf "\e[0;91mPlease reboot the system as soon as possible \x1B[0m \n\n"
-	(sleep 1 && rm "$0") &
+	printf "\e[0;91mWarning: a reboot is needed to finish resizing the filesystem \x1B[0m \n"
+	printf "\e[0;91mPlease reboot the system as soon as possible \x1B[0m \n"
 fi
diff --git a/packages/bsp/common/etc/update-motd.d/99-point-to-faq b/packages/bsp/common/etc/update-motd.d/99-point-to-faq
index daff34a24..6d8809b3b 100755
--- a/packages/bsp/common/etc/update-motd.d/99-point-to-faq
+++ b/packages/bsp/common/etc/update-motd.d/99-point-to-faq
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# DO NOT EDIT THIS FILE
+# any changes will be lost on board support package update
+
 THIS_SCRIPT="point-to-faq"
 MOTD_DISABLE=""
 
@@ -11,6 +14,6 @@ done
 
 . /etc/armbian-release
 
-printf "New to Armbian? Check the documentation first: \e[0;92mhttps://docs.armbian.com\x1B[0m\n\n"
+printf "New to Armbian? Check the documentation first: \e[0;92mhttps://docs.armbian.com\x1B[0m\n"
 
-(sleep 1 && rm "$0") &
\ No newline at end of file
+(sleep 1 && rm "$0") &