diff --git a/roles/kiwix/tasks/kiwix_install.yml b/roles/kiwix/tasks/kiwix_install.yml
index 297d0ff7f..f36dd2209 100644
--- a/roles/kiwix/tasks/kiwix_install.yml
+++ b/roles/kiwix/tasks/kiwix_install.yml
@@ -54,7 +54,7 @@
         mode=0755
         state=directory
 
-- name: Enable the mods which permit Apache to proxy
+- name: Enable the mods which permit Apache to proxy (debuntu)
   apache2_module: name={{ item }}
   with_items:
     - proxy
@@ -90,7 +90,7 @@
               dest=/etc/crontab
   when: is_redhat
 
-# Create kiwix service
+# Create Kiwix service
 
 - name: Create 'kiwix-serve' service
   template: backup=no
@@ -101,13 +101,11 @@
             mode={{ item.mode }}
   with_items:
     - { src: 'kiwix-serve.service.j2', dest: '/etc/systemd/system/kiwix-serve.service', mode: '0644'}
-
 #    - { src: 'kiwix-serve-init.j2', dest: '/usr/libexec/kiwix-serve-init', mode: '0755'}
     - { src: 'iiab-make-kiwix-lib', dest: '/usr/bin/iiab-make-kiwix-lib', mode: '0755'}
     - { src: 'iiab-make-kiwix-lib.py', dest: '/usr/bin/iiab-make-kiwix-lib.py', mode: '0755'}
     - { src: 'iiab-make-apache-config.py', dest: '/usr/bin/iiab-make-apache-config.py', mode: '0755'}
 
-
 - name: Add 'kiwix-serve' to list of services
   ini_file: dest='{{ service_filelist }}'
             section=kiwix-serve
diff --git a/roles/kiwix/tasks/main.yml b/roles/kiwix/tasks/main.yml
index 66dceec9f..ee54bb095 100644
--- a/roles/kiwix/tasks/main.yml
+++ b/roles/kiwix/tasks/main.yml
@@ -4,20 +4,20 @@
 #     kiwix_src_bin_only: False
 #  when: ansible_machine == "i686"
 
-- name: Set kiwix source file name x86_64
+- name: Set Kiwix filename to d/l: kiwix-tools_linux64_2017-11-12.tar.gz (x86_64)
   set_fact:
      kiwix_src_file: "kiwix-tools_linux64_2017-11-12.tar.gz"
      kiwix_src_bin_only: True
   when: ansible_machine == "x86_64"
 
-- name: Set kiwix source file name armv7l
+- name: Set Kiwix filename to d/l: kiwix-tools_armhf_2017-11-12.tar.gz (armv6l or armv71)
   set_fact:
      kiwix_src_file: "kiwix-tools_armhf_2017-11-12.tar.gz"
      kiwix_src_bin_only: True
   when: ansible_machine == "armv7l" or ansible_machine == "armv6l"
 
-- name: Get the Kiwix software
-  get_url: url="{{ iiab_download_url }}/{{ kiwix_src_file }}"  dest="{{ downloads_dir }}/{{ kiwix_src_file }}"
+- name: Download the Kiwix software to /opt/iiab/downloads
+  get_url: url="{{ iiab_download_url }}/{{ kiwix_src_file }}" dest="{{ downloads_dir }}/{{ kiwix_src_file }}"
   when: internet_available
 
 - include_tasks: kiwix_install.yml
@@ -25,5 +25,5 @@
   tags:
     - kiwix
 
-- debug:  msg="WARNING kiwix source is not defined for your platform"
+- debug: msg="WARNING kiwix source is not defined for your platform"
   when: not kiwix_src_file