diff --git a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
index 22cb73a..53f5369 100644
--- a/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
+++ b/doc/puppet_classes/confdroid_nagios_3A_3Aparams.html
@@ -1117,6 +1117,312 @@ inherited by all classes except defines.
         —
         <div class='inline'>
 <p>Whether to log notifications in Nagios. Default is ‘1’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_log_service_retries</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Whether to log service check retries in Nagios. Default is ‘1’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_log_host_retries</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Whether to log host check retries in Nagios. Default is ‘1’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_log_event_handlers</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Whether to log event handlers in Nagios. Default is ‘1’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_log_initial_states</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;0&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Whether to log initial states in Nagios. Default is ‘0’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_log_current_states</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Whether to log current states in Nagios. Default is ‘1’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_log_external_commands</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Whether to log external commands in Nagios. Default is ‘1’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_log_passive_checks</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;1&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>Whether to log passive checks in Nagios. Default is ‘1’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_glob_host_evt_handler</span>
+      
+      
+        <span class='type'>(<tt>Array</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>[]</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>An array of global host event handlers for Nagios. Default is [].</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_glob_svc_evt_handler</span>
+      
+      
+        <span class='type'>(<tt>Array</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>[]</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>An array of global service event handlers for Nagios. Default is [].</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_svc_int_check_delay</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;s&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>The service inter-check delay method for Nagios. Default is ‘s’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_max_svc_check_spread</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;30&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>The maximum service check spread for Nagios. Default is ‘30’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_svc_interleave_factor</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;s&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>The service interleave factor for Nagios. Default is ‘s’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_host_int_check_delay</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;s&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>The host inter-check delay method for Nagios. Default is ‘s’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_max_host_check_spread</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;30&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>The maximum host check spread for Nagios. Default is ‘30’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_max_concurrent_checks</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;0&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>The maximum number of concurrent checks for Nagios. Default is ‘0’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_check_res_reaper_freq</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;10&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>The check result reaper frequency for Nagios. Default is ‘10’.</p>
+</div>
+      
+    </li>
+  
+    <li>
+      
+        <span class='name'>ng_max_check_res_reap_time</span>
+      
+      
+        <span class='type'>(<tt>String</tt>)</span>
+      
+      
+        <em class="default">(defaults to: <tt>&#39;30&#39;</tt>)</em>
+      
+      
+        &mdash;
+        <div class='inline'>
+<p>The maximum check result reaper time for Nagios. Default is ‘30’.</p>
 </div>
       
     </li>
@@ -1132,40 +1438,6 @@ inherited by all classes except defines.
         <pre class="lines">
 
 
-121
-122
-123
-124
-125
-126
-127
-128
-129
-130
-131
-132
-133
-134
-135
-136
-137
-138
-139
-140
-141
-142
-143
-144
-145
-146
-147
-148
-149
-150
-151
-152
-153
-154
 155
 156
 157
@@ -1314,27 +1586,78 @@ inherited by all classes except defines.
 300
 301
 302
-303</pre>
+303
+304
+305
+306
+307
+308
+309
+310
+311
+312
+313
+314
+315
+316
+317
+318
+319
+320
+321
+322
+323
+324
+325
+326
+327
+328
+329
+330
+331
+332
+333
+334
+335
+336
+337
+338
+339
+340
+341
+342
+343
+344
+345
+346
+347
+348
+349
+350
+351
+352
+353
+354</pre>
       </td>
       <td>
-        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 121</span>
+        <pre class="code"><span class="info file"># File 'manifests/params.pp', line 155</span>
 
 class confdroid_nagios::params (
 
 # main
-  String $ng_nagios_server          = &#39;nagios.example.net&#39;,
-  Array $ng_reqpackages_server      = [&#39;nagios&#39;,&#39;nagios-devel&#39;],
-  Array $ng_reqpackages_client      = [&#39;net-snmp-utils&#39;,&#39;nagios-plugins&#39;,&#39;nagios-plugins-all&#39;,&#39;nagios-plugins-nrpe&#39;,&#39;nagios-common&#39;],
-  String $ng_pkg_ensure             = &#39;present&#39;,
-  Boolean $ng_include_nrpe          = true,
-  String $ng_main_user              = &#39;nagios&#39;,
-  String $ng_main_password          = &#39;nagios&#39;,
-  String $ng_max_check_attempts     = &#39;10&#39;,
-  String $ng_status_upd_interval    = &#39;10&#39;,
-  String $ng_check_ext_commands     = &#39;1&#39;,
-  String $ng_user                   = &#39;nagios&#39;,
-  Boolean $ng_enable_target         = true,
-  Boolean $ng_purge_target          = true,
+  String $ng_nagios_server           = &#39;nagios.example.net&#39;,
+  Array $ng_reqpackages_server       = [&#39;nagios&#39;,&#39;nagios-devel&#39;],
+  Array $ng_reqpackages_client       = [&#39;net-snmp-utils&#39;,&#39;nagios-plugins&#39;,&#39;nagios-plugins-all&#39;,&#39;nagios-plugins-nrpe&#39;,&#39;nagios-common&#39;],
+  String $ng_pkg_ensure              = &#39;present&#39;,
+  Boolean $ng_include_nrpe           = true,
+  String $ng_main_user               = &#39;nagios&#39;,
+  String $ng_main_password           = &#39;nagios&#39;,
+  String $ng_max_check_attempts      = &#39;10&#39;,
+  String $ng_status_upd_interval     = &#39;10&#39;,
+  String $ng_check_ext_commands      = &#39;1&#39;,
+  String $ng_user                    = &#39;nagios&#39;,
+  Boolean $ng_enable_target          = true,
+  Boolean $ng_purge_target           = true,
 
 # contact groups
   String $ng_contactgroup_name       = &#39;admins&#39;,
@@ -1348,17 +1671,34 @@ class confdroid_nagios::params (
   String $ng_contact_email           = &#39;nagiosadmin@example.net&#39;,
 
 # hostgroups
-  String $ng_hostgroup_name         = &#39;linux-servers&#39;,
-  String $ng_hostgroup_alias        = &#39;Linux Servers&#39;,
+  String $ng_hostgroup_name          = &#39;linux-servers&#39;,
+  String $ng_hostgroup_alias         = &#39;Linux Servers&#39;,
 
 # nagios.cfg
-  String $ng_log_file               = &#39;/var/log/nagios/nagios.log&#39;,
-  String $ng_event_broker_options   = &#39;-1&#39;,
-  Boolean $ng_enable_query_handler  = false,
-  Array $ng_event_broker_module     = [],
-  String $ng_log_rotation_method    = &#39;d&#39;,
-  String $ng_use_syslog             = &#39;1&#39;,
-  String $ng_log_notifications      = &#39;1&#39;,
+  String $ng_log_file                = &#39;/var/log/nagios/nagios.log&#39;,
+  String $ng_event_broker_options    = &#39;-1&#39;,
+  Boolean $ng_enable_query_handler   = false,
+  Array $ng_event_broker_module      = [],
+  String $ng_log_rotation_method     = &#39;d&#39;,
+  String $ng_use_syslog              = &#39;1&#39;,
+  String $ng_log_notifications       = &#39;1&#39;,
+  String $ng_log_service_retries     = &#39;1&#39;,
+  String $ng_log_host_retries        = &#39;1&#39;,
+  String $ng_log_event_handlers      = &#39;1&#39;,
+  String $ng_log_initial_states      = &#39;0&#39;,
+  String $ng_log_current_states      = &#39;1&#39;,
+  String $ng_log_external_commands   = &#39;1&#39;,
+  String $ng_log_passive_checks      = &#39;1&#39;,
+  Array $ng_glob_host_evt_handler    = [],
+  Array $ng_glob_svc_evt_handler     = [],
+  String $ng_svc_int_check_delay     = &#39;s&#39;,
+  String $ng_max_svc_check_spread    = &#39;30&#39;,
+  String $ng_svc_interleave_factor   = &#39;s&#39;,
+  String $ng_host_int_check_delay    = &#39;s&#39;,
+  String $ng_max_host_check_spread   = &#39;30&#39;,
+  String $ng_max_concurrent_checks   = &#39;0&#39;,
+  String $ng_check_res_reaper_freq   = &#39;10&#39;,
+  String $ng_max_check_res_reap_time = &#39;30&#39;,
 
 # cgi.cfg
   String $ng_context_help           = &#39;1&#39;,