diff --git a/create_latest_candle_dev.sh b/create_latest_candle_dev.sh
index c55634c..4a26c84 100644
--- a/create_latest_candle_dev.sh
+++ b/create_latest_candle_dev.sh
@@ -1670,16 +1670,6 @@ find /home/pi/.webthings/tmp \
 
 cd /home/pi
 
-if [ -e /home/pi/webthings/gateway/static/images/floorplan.svg ];
-then
-    cp /home/pi/webthings/gateway/static/images/floorplan.svg /home/pi/.webthings/floorplan.svg
-    chown pi:pi /home/pi/.webthings/floorplan.svg
-else
-    echo ""
-    echo "WARNING: missing floorplan"
-    echo ""
-fi
-
 # SYMLINKS
 
 # move hosts file to user partition
@@ -1788,6 +1778,7 @@ chmod +x /home/pi/candle/late.sh
 chmod +x /etc/rc.local
 chmod +x /home/pi/candle/debug.sh
 chmod +x /home/pi/candle/files_check.sh
+chmod +x /home/pi/candle/prepare_for_disk_image.sh
 chmod +x /home/pi/candle/unsnap.sh
 
 # CHOWN THE NEW FILES
@@ -1829,6 +1820,7 @@ echo
 systemctl enable candle_first_run.service
 #systemctl enable candle_start_swap.service
 systemctl enable candle_early.service
+systemctl enable candle_late.service 
 systemctl enable candle_late.service
 systemctl enable candle_splashscreen.service
 systemctl enable candle_splashscreen180.service
@@ -2440,6 +2432,15 @@ then
 fi
 
 
+if [ -e /home/pi/webthings/gateway/static/images/floorplan.svg ];
+then
+    cp /home/pi/webthings/gateway/static/images/floorplan.svg /home/pi/.webthings/floorplan.svg
+    chown pi:pi /home/pi/.webthings/floorplan.svg
+else
+    echo ""
+    echo "WARNING: missing floorplan"
+    echo ""
+fi
 
 
 
@@ -2451,6 +2452,10 @@ if [ -f /home/pi/create_latest_candle.sh ]; then
     rm /home/pi/create_latest_candle.sh
 fi
 
+if [ -f /home/pi/ro-root.sh ]; then
+    rm /home/pi/ro-root.sh
+fi
+
 
 # Some final insurance
 chown pi:pi /home/pi/*
@@ -2463,6 +2468,11 @@ chown -R pi:pi /home/pi/candle/*
 #
 
 
+if [ -f /boot/cmdline-candle.txt ]; then
+    echo "copying default Candle cmdline.txt into place"
+    rm /boot/cmdline.txt
+    cp /boot/cmdline-candle.txt /boot/cmdline.txt
+fi
 
 
 # cp /home/pi/.webthings/etc/webthings_settings_backup.js /home/pi/.webthings/etc/webthings_settings.js
@@ -2477,7 +2487,7 @@ if [ ! -f /home/pi/candle/creation_date.txt ]; then
 fi
 
 # remember when the update script was last run
-echo "$(date +%s)" > /home/pi/candle/update_date
+echo "$(date +%s)" > /home/pi/candle/update_date.txt
 
 # Disable old bootup actions service
 systemctl disable candle_bootup_actions.service
diff --git a/install_candle_controller.sh b/install_candle_controller.sh
index 49b1024..f6416f8 100644
--- a/install_candle_controller.sh
+++ b/install_candle_controller.sh
@@ -559,6 +559,7 @@ then
     chown -R pi:pi candle-theme
     rm ./*.tgz
 
+
     rm -rf package
     rm -rf tutorial
     wget https://github.com/createcandle/tutorial/releases/download/1.0.7/tutorial-1.0.7.tgz
@@ -569,6 +570,7 @@ then
     chown -R pi:pi tutorial
     rm ./*.tgz
 
+
     rm -rf package
     rm -rf bluetoothpairing
     wget https://github.com/createcandle/bluetoothpairing/releases/download/0.5.8/bluetoothpairing-0.5.8.tgz
@@ -579,6 +581,7 @@ then
     chown -R pi:pi bluetoothpairing
     rm ./*.tgz
 
+
     rm -rf package
     rm -rf photo-frame
     wget https://github.com/flatsiedatsie/photo-frame/releases/download/1.4.17/photo-frame-1.4.17.tgz
@@ -589,6 +592,7 @@ then
     chown -R pi:pi photo-frame
     rm ./*.tgz
 
+
     rm -rf package
     rm -rf followers
     wget https://github.com/flatsiedatsie/followers-addon/releases/download/0.6.8/followers-0.6.8.tgz
@@ -599,6 +603,7 @@ then
     chown -R pi:pi followers
     rm ./*.tgz
 
+
     rm -rf package
     rm -rf internet-radio
     wget https://github.com/flatsiedatsie/internet-radio/releases/download/2.1.32/internet-radio-2.1.32.tgz
@@ -609,6 +614,7 @@ then
     chown -R pi:pi internet-radio
     rm ./*.tgz
 
+
     rm -rf package
     rm -rf zigbee2mqtt-adapter
     wget https://github.com/kabbi/zigbee2mqtt-adapter/releases/download/1.1.3/zigbee2mqtt-adapter-1.1.3.tgz
@@ -620,6 +626,7 @@ then
     chown -R pi:pi zigbee2mqtt-adapter
     rm ./*.tgz
 
+
     rm -rf package
     rm -rf privacy-manager
     wget https://github.com/createcandle/privacy-manager/releases/download/0.2.8/privacy-manager-0.2.8.tgz
@@ -630,6 +637,7 @@ then
     chown -R pi:pi privacy-manager
     rm ./*.tgz
 
+
     rm -rf package
     rm -rf webinterface
     wget https://github.com/createcandle/webinterface/releases/download/0.2.3/webinterface-0.2.3.tgz
@@ -640,7 +648,7 @@ then
     chown -R pi:pi webinterface
     rm ./*.tgz
     
-    rm candleappstore-0.4.18-linux-arm-v3.9.tgz
+    
     rm -rf package
     rm -rf candleappstore
     wget https://github.com/createcandle/candleappstore/releases/download/0.4.18/candleappstore-0.4.18-linux-arm-v3.9.tgz