diff --git a/defaults/main.yml b/defaults/main.yml
index ce31e47..fd7789f 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,22 +1,42 @@
 ---
-# defaults file for guisea.common
+# defaults file for cybercinch.common
+
+# What is the domain name for this machine?
 common_domain: exampledomain.com
-ad_domain_joined: no
-common_win_timezone: New Zealand Standard Time
+
+# Timezone string for Windows nodes
+common_win_tz: New Zealand Standard Time
+
+# Timezone string for Linux nodes
 common_tz: Pacific/Auckland
+
+# Additional host entries to add to /etc/hosts if required
+# e.g 
+# common_vendors_hosts:
+#   - ip: 192.168.1.3
+#     name: an.alias.hostname
+#   - ip: 192.168.1.4
+#     name: another.alias.hostname
 common_vendors_hosts: []
 
+# What DNS Servers should we use by default
 common_dns_servers:
   - 1.0.0.1
   - 1.1.1.1
 
+# The name of the security group for administrators
 common_admin_group: admins
 
-
+# Configuration of Grub boot timeout
 common_grub_timeout: 5
+
+# Should we configure postfix?
 common_postfix_configure: false
+
+# This relayhost will be set if common_postfix_configure is true
 common_postfix_relayhost: some.smtp.server
 
+# Common packages to install in the case of Linux
 common_packages:
   - nano
   - git
@@ -26,7 +46,8 @@ common_packages:
   - bind-utils
   - yum-utils
   - unzip
-  
+
+# Common packages to install in the case of Windows
 common_win_packages:
   - notepadplusplus.install
   - firefoxesr
@@ -35,6 +56,13 @@ common_win_packages:
   
 common_apply_win_updates: false
 
+# Does this node have ipv6?  If so set to true to add ipv4 and ipv6 to Dynamic MOTD
 common_show_ipv6: false
+
+# Want to change the root password?
+common_change_root_pwd: false
+# The crypted password you wish to set for root password
+# Only fires if common_change_root_pwd is true default = false
 common_root_pwd: $6$5GG7U/EyDL$L/UkIlhoVABnvjtJl0zGwryjgRF9wNZ5wIAIAVfViROiMUK0tUsuZmO.x87tpDYUJA0QR5pCo4yd.2sLgSlHU0
-common_root_email: anemail@someco.com
\ No newline at end of file
+# This email address is set as the forwarding address for root.  Used for notifications.
+common_root_email: anemail@someco.com
diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index 8cdd640..a816e77 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -56,6 +56,7 @@
     name: root 
     password: "{{ common_root_pwd }}"
   changed_when: false
+  when: common_change_root_pwd
   tags: rootpw
 
 - name: Set timezone