diff --git a/roles/1-prep/tasks/raspberry_pi.yml b/roles/1-prep/tasks/raspberry_pi.yml
index ccaafff24..89f1a6b66 100644
--- a/roles/1-prep/tasks/raspberry_pi.yml
+++ b/roles/1-prep/tasks/raspberry_pi.yml
@@ -1,6 +1,6 @@
 # Setup specific to the Raspberry Pi
 
-- name: Add a udev rule to transfer hwclock to system clock at dev creation
+- name: Install udev rule /etc/udev/rules.d/92-rtc-i2c.rules from template, to transfer hwclock to system clock at dev creation, if rtc_id is defined and rtc_id != "none"
   template:
     src: 92-rtc-i2c.rules
     dest: /etc/udev/rules.d/92-rtc-i2c.rules
@@ -10,15 +10,15 @@
   when: rtc_id is defined and rtc_id != "none"
 
 # RTC requires a change to the device tree (and reboot)
-- name: Check for needing to enable i2c rtc device in config.txt
+- name: Check for need to enable i2c-rtc device in /boot/config.txt (requires reboot!)
   lineinfile:
     dest: /boot/config.txt
     line: "dtoverlay=i2c-rtc,{{ rtc_id }}=on"
     state: present
-  register: rpiconfig
+  register: rpiconfig    # HMMM REGISTER "rpiconfig" IS *COMPLETELY UNUSED* AS OF 2018-11-02
   when: rtc_id != "none"
 
-- name: Add a udev rule to transfer hwclock to system clock at dev creation
+- name: Install udev rule /etc/udev/rules.d/92-rtc-i2c.rules from template, to transfer hwclock to system clock at dev creation, if rtc_id != "none"
   template:
     src: 92-rtc-i2c.rules
     dest: /etc/udev/rules.d/92-rtc-i2c.rules
@@ -27,25 +27,23 @@
     mode: 0644
   when: rtc_id != "none"
 
-- name: Pre-install packages
+- name: Install latest ntp package
   package:
-    name: "{{ item }}"
+    name: ntp
     state: latest
-  with_items:
-    - ntp
 
-- name: Increase the swap file size, as kalite pip download fails (debuntu)
+- name: Increase swap file size (to CONF_SWAPSIZE=500 in /etc/dphys-swapfile) as kalite pip download fails (debuntu)
   lineinfile:
     regexp: "^CONF_SWAPSIZE"
     line: CONF_SWAPSIZE=500
-    dest: /etc/dphys-swapfile
+    path: /etc/dphys-swapfile
   when: is_debuntu
 
 - name: Restart the swap service (debuntu)
   command: /etc/init.d/dphys-swapfile restart
   when: is_debuntu
 
-- name: Add RPi rootfs resizing service
+- name: Add RPi rootfs resizing systemd service
   template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"