diff --git a/roles/nodogsplash/tasks/rpi.yml b/roles/nodogsplash/tasks/rpi.yml
index 2bf76b9e2..56d180f0f 100644
--- a/roles/nodogsplash/tasks/rpi.yml
+++ b/roles/nodogsplash/tasks/rpi.yml
@@ -1,9 +1,9 @@
-- name: nodogsplash dependencies
+- name: Install package libmicrohttpd12 (Nodogsplash dependencies)
   package:
     name: libmicrohttpd12
     state: present
 
-- name: Download nodogsplash software
+- name: Download {{ iiab_download_url }}/{{ nodogsplash_arm_deb }} to {{ downloads_dir }}
   get_url:
      url: "{{ iiab_download_url }}/{{ nodogsplash_arm_deb }}"
      dest: "{{ downloads_dir }}/{{ nodogsplash_arm_deb }}"
@@ -12,9 +12,9 @@
   #async: 300
   #poll: 5
 
-- name: Install nodogsplash
+- name: Install Nodogsplash
   apt:
-    deb="{{ downloads_dir }}/{{ nodogsplash_arm_deb }}"
+    deb: "{{ downloads_dir }}/{{ nodogsplash_arm_deb }}"
 
 #- name: Create nodogsplash.service # deb file has one
 #  template:
@@ -25,7 +25,7 @@
 #    group: root
 #    mode: 0644
 
-- name: Install custom files
+- name: Install custom /etc/nodogsplash/nodogsplash.conf, /etc/nodogsplash/htdocs/splash.html
   template:
     backup: no
     src: "{{ item.src }}"
@@ -38,23 +38,23 @@
     - { src: 'splash.html.j2', dest: '/etc/nodogsplash/htdocs/splash.html', mode: '0644'}
 
 # We should probably only start this service on next boot
-- name: Enable nodogsplash service
-  service:
+- name: Enable & Start 'nodogsplash' systemd service, if nodogsplash_enabled
+  systemd:
     name: nodogsplash
     enabled: yes
     state: started
   when: nodogsplash_enabled
 
-- name: Disable nodogsplash service
-  service:
+- name: Disable 'nodogsplash' systemd service, if not nodogsplash_enabled
+  systemd:
     name: nodogsplash
     enabled: no
     state: stopped
   when: not nodogsplash_enabled
 
-- name: Add 'nodogsplash' to list of services at {{ iiab_ini_file }}
+- name: Add 'nodogsplash' variable values to {{ iiab_ini_file }}
   ini_file:
-    dest: "{{ iiab_ini_file }}"
+    path: "{{ iiab_ini_file }}"
     section: nodogsplash
     option: "{{ item.option }}"
     value: "{{ item.value }}"