diff --git a/roles/9-local-addons/tasks/main.yml b/roles/9-local-addons/tasks/main.yml
index 8a7bf15cd..4026b3412 100644
--- a/roles/9-local-addons/tasks/main.yml
+++ b/roles/9-local-addons/tasks/main.yml
@@ -7,7 +7,6 @@
   include_role:
     name: internetarchive
   when: internetarchive_install | bool
-  #tags: internetarchive
 
 # Is porting to Python 3 complete, and if so does this belong elsewhere?
 - name: CAPTIVE PORTAL
@@ -15,43 +14,41 @@
     name: captiveportal
   #include_tasks: roles/captiveportal/tasks/main.yml
   when: captiveportal_install | bool
-  #tags: base, captiveportal, network, domain
 
 - name: MINETEST
   include_role:
     name: minetest
   when: minetest_install | bool
-  #tags: minetest
 
 # KEEP AT THE END as this installs dependencies from Debian's 'testing' branch!
 - name: CALIBRE
   include_role:
     name: calibre
   when: calibre_install | bool
-  #tags: calibre
 
 - name: CALIBRE-WEB
   include_role:
     name: calibre-web
   when: calibreweb_install | bool
-  #tags: calibre-web
 
 # Could split these two below to Stage 10?
 
-- name: Configure NGINX (already installed in Stage 3-BASE-SERVER)
-  # If just CONFIGURING, should we use one of the following instead ??
-  # include_tasks: roles/nginx/tasks/setup.yml
-  # include_tasks: roles/nginx/tasks/enable.yml
+- name: Fully Enable / Configure NGINX (already installed in Stage 3-BASE-SERVER) if 'nginx_enabled' is True
   include_role:
     name: nginx
-  when: nginx_install | bool
-  #tags: base, nginx
+  when: nginx_enabled | bool    # WAS: nginx_install
+# If just CONFIGURING (etc) shouldn't we use one of the following instead ??
+# include_tasks: roles/nginx/tasks/setup.yml
+# include_tasks: roles/nginx/tasks/enable.yml
 
-- name: Configure Apache systemd service ({{ apache_service }})
+- name: Fully Enable / Configure Apache systemd service ({{ apache_service }}) if 'apache_enabled' is True
   include_role:
     name: httpd-enable
-  when: apache_install | bool
-  #tags: base, httpd
+  when: apache_enabled | bool    # WAS: apache_install
+# WARNING THAT APACHE IS AUTO-ENABLED BY THESE ~6 APPS ALONE!
+# https://github.com/holta/iiab/blob/scaff2/roles/0-init/tasks/main.yml#L40-L44
+# Summarized @ https://github.com/iiab/iiab/blob/master/roles/nginx/README.md
+# 2020-01-23: APACHE FUTURE SUMMARY QUESTIONS @ roles/httpd/tasks/main.yml
 
 - name: Recording STAGE 9 HAS COMPLETED ====================
   lineinfile: