diff --git a/check_mk-infoblox/infoblox_dns-1.0.0.mkp b/check_mk-infoblox/infoblox_dns-1.0.0.mkp
deleted file mode 100644
index d38b54c..0000000
Binary files a/check_mk-infoblox/infoblox_dns-1.0.0.mkp and /dev/null differ
diff --git a/check_mk-infoblox/infoblox_dns-1.0.1.mkp b/check_mk-infoblox/infoblox_dns-1.0.1.mkp
new file mode 100644
index 0000000..803d2c0
Binary files /dev/null and b/check_mk-infoblox/infoblox_dns-1.0.1.mkp differ
diff --git a/check_mk-infoblox/local/share/check_mk/checks/infoblox_aat5_count b/check_mk-infoblox/local/share/check_mk/checks/infoblox_aat5_count
index 63af393..d025aad 100644
--- a/check_mk-infoblox/local/share/check_mk/checks/infoblox_aat5_count
+++ b/check_mk-infoblox/local/share/check_mk/checks/infoblox_aat5_count
@@ -37,18 +37,18 @@ def check_infoblox_aat5_count(item, params, info):
     if params:
         warn, crit = params['infoblox_count']
     else:
-	warn, crit = (50, 100)
+        warn, crit = (50, 100)
     state = 0
     count_info = ""
     if count > warn:
         if count > crit:
             state = 2
-            count_info = "(crit above %s)" % crit
+            count_info = "Number of AAT5 Requests is %s (crit above %s requests)" % (count, crit)
         else:
             state = 1
-            count_info = "(warn above %s)" % warn
+            count_info = "Number of AAT5 Requests is %s (warn above %s requests)" % (count, warn)
     else:
-        count_info = "Count is is %s" % count
+        count_info = "Number of AAT5 Requests is %s" % count
     yield state, count_info, [('Count', count, warn, crit)]          
 
 check_info['infoblox_aat5_count'] = {
diff --git a/check_mk-infoblox/local/share/check_mk/checks/infoblox_aat5_latency b/check_mk-infoblox/local/share/check_mk/checks/infoblox_aat5_latency
index b77f57f..bf4b3e0 100644
--- a/check_mk-infoblox/local/share/check_mk/checks/infoblox_aat5_latency
+++ b/check_mk-infoblox/local/share/check_mk/checks/infoblox_aat5_latency
@@ -33,24 +33,22 @@ def inventory_infoblox_aat5_latency(info):
     yield item, {}
 
 def check_infoblox_aat5_latency(item, params, info):
-    print item
     latency=int(info[0][0])
-    print params
     if params:
         warn, crit = params['infoblox_latency']
     else:
-	warn, crit = (50, 100)
+        warn, crit = (50, 100)
     state = 0
     latency_info = ""
     if latency > warn:
         if latency > crit:
             state = 2
-            latency_info = "(crit above %s)" % crit
+            latency_info = "Latency is %s ms (crit above %s ms)" % (latency, crit)
         else:
             state = 1
-            latency_info = "(warn above %s)" % warn
+            latency_info = "Latency is %s ms (warn above %s ms)" % (latency, warn)
     else:
-        latency_info = "Latency is %s" % latency
+        latency_info = "Latency is %s ms" % latency
     yield state, latency_info, [('Latency', latency, warn, crit)]          
 
 check_info['infoblox_aat5_latency'] = {
diff --git a/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_count b/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_count
index 809647b..e5b14a9 100644
--- a/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_count
+++ b/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_count
@@ -38,18 +38,18 @@ def check_infoblox_nonaat5_count(item, params, info):
     if params:
         warn, crit = params['infoblox_count']
     else:
-	warn, crit = (50, 100)
+        warn, crit = (50, 100)
     state = 0
     count_info = ""
     if count > warn:
         if count > crit:
             state = 2
-            count_info = "(crit above %s)" % crit
+            count_info = "Number of NonAAT5 Requests is %s (crit above %s requests)" % (count, crit)
         else:
             state = 1
-            count_info = "(warn above %s)" % warn
+            count_info = "Number of NonAAT5 Requests is %s (warn above %s requests)" % (count, warn)
     else:
-        count_info = "Count is is %s" % count
+        count_info = "Number of NonAAT5 Requests is %s" % count
     yield state, count_info, [('Count', count, warn, crit)]          
 
 check_info['infoblox_nonaat5_count'] = {
diff --git a/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_latency b/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_latency
index 6b62d61..e499e3a 100644
--- a/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_latency
+++ b/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_latency
@@ -35,22 +35,21 @@ def inventory_infoblox_nonaat5_latency(info):
 
 def check_infoblox_nonaat5_latency(item, params, info):
     latency=int(info[0][0])
-    print params
     if params:
         warn, crit = params['infoblox_latency']
     else:
-	warn, crit = (50, 100)
+        warn, crit = (50, 100)
     state = 0
     latency_info = ""
     if latency > warn:
         if latency > crit:
             state = 2
-            latency_info = "(crit above %s)" % crit
+            latency_info = "Latency is %s ms (crit above %s ms)" % (latency, crit)
         else:
             state = 1
-            latency_info = "(warn above %s)" % warn
+            latency_info = "Latency is %s ms (warn above %s ms)" % (latency, warn)
     else:
-        latency_info = "Latency is %s" % latency
+        latency_info = "Latency is %s ms" % latency
     yield state, latency_info, [('Latency', latency, warn, crit)]          
 
 check_info['infoblox_nonaat5_latency'] = {