diff --git a/bootstrap.d/15-rpi-config.sh b/bootstrap.d/15-rpi-config.sh
index 42f3b36..f810ab2 100644
--- a/bootstrap.d/15-rpi-config.sh
+++ b/bootstrap.d/15-rpi-config.sh
@@ -52,6 +52,7 @@ else
 fi
 
 
+
 # Add encrypted root partition to cmdline.txt
 if [ "$ENABLE_CRYPTFS" = true ] ; then
   if [ "$ENABLE_SPLITFS" = true ] ; then
@@ -104,10 +105,28 @@ if [ "$ENABLE_INITRAMFS" = true ] ; then
 fi
 
 # Disable RPi3 Bluetooth and restore ttyAMA0 serial device
-if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] ; then
+if [ "$RPI_MODEL" = 3 ] || [ "$RPI_MODEL" = 3P ] || [ "$RPI_MODEL" = 3P ]; then
   if [ "$ENABLE_CONSOLE" = true ] && [ "$ENABLE_UBOOT" = false ] ; then
     echo "dtoverlay=pi3-disable-bt" >> "${BOOT_DIR}/config.txt"
     echo "enable_uart=1" >> "${BOOT_DIR}/config.txt"
+  #else
+        # Create temporary directory for U-Boot sources
+    #temp_dir=$(as_nobody mktemp -d)
+
+    # Fetch U-Boot sources
+    #as_nobody git -C "${temp_dir}" clone "${BLUETOOTH_URL}"
+
+    # Copy downloaded U-Boot sources
+    #mv "${temp_dir}/pi-bluetooth" "${R}/tmp/"
+
+    # Set permissions of the U-Boot sources
+    #chown -R root:root "${R}/tmp/pi-bluetooth"
+
+    # Remove temporary directory for U-Boot sources
+    #rm -fr "${temp_dir}"
+
+
+    #"${R}/tmp/userland"
   fi
 fi
 
diff --git a/bootstrap.d/16-videocore.sh b/bootstrap.d/16-videocore.sh
index 8dedc17..9ccb848 100644
--- a/bootstrap.d/16-videocore.sh
+++ b/bootstrap.d/16-videocore.sh
@@ -42,5 +42,5 @@ if [ "$ENABLE_VIDEOCORE" = true ] ; then
   #build userland
   make -j "$(nproc)"
   #include default_installdir in path
-  chroot_exec PATH="${PATH}":/opt/vc/bin
+#  chroot_exec export PATH="${PATH}":/opt/vc/bin
 fi
diff --git a/bootstrap.d/41-uboot.sh b/bootstrap.d/41-uboot.sh
index 992e532..d7e4516 100644
--- a/bootstrap.d/41-uboot.sh
+++ b/bootstrap.d/41-uboot.sh
@@ -72,6 +72,7 @@ if [ "$ENABLE_UBOOT" = true ] ; then
     printf "\n# 64bit-mode" >> "${BOOT_DIR}/config.txt"
     printf "\n# arm_control=0x200 is deprecated https://www.raspberrypi.org/documentation/configuration/config-txt/misc.md" >> "${BOOT_DIR}/config.txt"
     printf "\narm_64bit=1" >> "${BOOT_DIR}/config.txt"
+    #in 64bit uboot booti is used instead of bootz [like in KERNEL_BIN_IMAGE=zImage (armv7)|| Image(armv8)]
     sed -i "s|bootz|booti|g" "${BOOT_DIR}/uboot.mkimage"
   fi
   
diff --git a/rpi23-gen-image.sh b/rpi23-gen-image.sh
index 0e29c60..71b451d 100755
--- a/rpi23-gen-image.sh
+++ b/rpi23-gen-image.sh
@@ -56,6 +56,8 @@ COLLABORA_URL=${COLLABORA_URL:=https://repositories.collabora.co.uk/debian}
 FBTURBO_URL=${FBTURBO_URL:=https://github.com/ssvb/xf86-video-fbturbo.git}
 UBOOT_URL=${UBOOT_URL:=https://git.denx.de/u-boot.git}
 VIDEOCORE_URL=${VIDEOCORE_URL=https://github.com/raspberrypi/userland}
+#https://aur.archlinux.org/packages/pi-bluetooth/
+BLUETOOTH_URL=${BLUETOOTH_URL:=https://aur.archlinux.org/pi-bluetooth.git}
 
 # Build directories
 BASEDIR=${BASEDIR:=$(pwd)/images/${RELEASE}}