diff --git a/tools/munin-node-from-hell/README.rst b/tools/munin-node-from-hell/README.rst
index 5731e589..2e7a04aa 100644
--- a/tools/munin-node-from-hell/README.rst
+++ b/tools/munin-node-from-hell/README.rst
@@ -10,8 +10,8 @@ stuff we do at http://hostedmunin.com/ . Use it as you feel fit :)
 Current features controlled via config file:
 
 * Respond slowly or never to queries.
-* Have plugins that always are in warning or alarm.
-* Extensive number of plugins.
+* Have plugins that always are in warning or critical.
+* Extensive number of plugins runnint at once.
 * Run on multiple ports at the same time, to test huge amounts of clients.
 
 
diff --git a/tools/munin-node-from-hell/basic.conf b/tools/munin-node-from-hell/basic.conf
new file mode 100644
index 00000000..64c83add
--- /dev/null
+++ b/tools/munin-node-from-hell/basic.conf
@@ -0,0 +1,15 @@
+# 
+# Initialise plugins that test the basic functions of Munin.
+#
+# 
+
+[instance:basic]
+pluginprofile = basic
+port = 4000
+
+[pluginprofile:basic]
+plugins = always_warning, always_critical, graph_area
+
+[base]
+# when building an example config with --muninconf, what hostname to output.
+hostname = localhost
diff --git a/tools/munin-node-from-hell/muninnode-from-hell b/tools/munin-node-from-hell/muninnode-from-hell
index 187c4138..5106a123 100755
--- a/tools/munin-node-from-hell/muninnode-from-hell
+++ b/tools/munin-node-from-hell/muninnode-from-hell
@@ -91,7 +91,7 @@ class always_warning(MuninPlugin):
         return """graph_title Always in warning
 graph_vlabel Level
 graph_scale no
-graph_info A simple graph that is always in warning or alarm
+graph_info A simple graph that is always in warning or critical
 graph_category active_notification
 generic.label Level
 generic.info Level usually above warning level
@@ -99,10 +99,36 @@ generic.warn 5
 generic.crit 10"""
 modules["always_warning"] = always_warning()
 
-class always_alarm(always_warning):
+class always_critical(always_warning):
     def fetch(self, conf):
         return "generic.value 20"
-modules["always_alarm"] = always_alarm()
+modules["always_critical"] = always_critical()
+
+class graph_area(MuninPlugin):
+    "A plugin that uses STACK and AREA. From proc_pri. Use: testing the grapher"
+    def fetch(self, conf):
+        return """high.value 3
+        low.value 2
+        locked.value 1"""
+
+    def config(self, conf):
+        return """graph_title AREA and STACK
+graph_order low high locked
+graph_category graphtes t
+graph_info This graph shows nuber of processes at each priority
+graph_args --base 1000 -l 0
+graph_vlabel Number of processes
+high.label high priority
+high.draw STACK
+high.info The number of high-priority processes (tasks)
+low.label low priority
+low.draw AREA
+low.info The number of low-priority processes (tasks)
+locked.label locked in memory
+locked.draw STACK
+locked.info The number of processes that have pages locked into memory (for real-time and custom IO)
+"""
+modules["graph_area"] = graph_area()
 
 
 class ArgumentTCPserver(SocketServer.ThreadingTCPServer):
diff --git a/tools/munin-node-from-hell/notifications.conf b/tools/munin-node-from-hell/notifications.conf
index 5a7b2c91..61f05118 100644
--- a/tools/munin-node-from-hell/notifications.conf
+++ b/tools/munin-node-from-hell/notifications.conf
@@ -12,7 +12,7 @@ port = 3000
 #port = 4940
 #sleepyness = 30
 [pluginprofile:notif]
-plugins = always_warning, always_alarm
+plugins = always_warning, always_critical
 
 [base]
 # when building an example config with --muninconf, what hostname to output.