diff --git a/doc/config.qdocconf b/doc/config.qdocconf
index f5212899..52571b84 100644
--- a/doc/config.qdocconf
+++ b/doc/config.qdocconf
@@ -34,4 +34,6 @@ exampledirs = ..
 sourcedirs = ..
 sources.fileextensions = "*.cpp *.qdoc"
 
+Cpp.ignoredirectives = DECLARE_TYPE \
+                       DECLARE_OBJECT
 
diff --git a/doc/tutorial1.qdoc b/doc/tutorial1.qdoc
index ef1ad2d2..802b5c49 100644
--- a/doc/tutorial1.qdoc
+++ b/doc/tutorial1.qdoc
@@ -3,6 +3,7 @@
     \title Tutorial 1 - The "Minimal" plugin
     \brief This tutorial shows you how to open, edit, build and load the first plugin.
     \ingroup tutorials
+    \contentspage {Tutorials}
 
     \section1 Topics
     This first tutorial shows you how to:
@@ -141,5 +142,4 @@
     \endlist
     
     Now you can take a look at \l{Tutorial 2 - The "Buttons" plugin}.
-
 */
diff --git a/doc/tutorial2.qdoc b/doc/tutorial2.qdoc
index e7aa6ea6..5847a260 100644
--- a/doc/tutorial2.qdoc
+++ b/doc/tutorial2.qdoc
@@ -458,7 +458,7 @@
         \li Start guh-cli and add the a new \b {"Simple Button"} devcice. Give an appropriate name like \b {Test button}.
         \li Use guh-cli to execute the \b {press the button} action: 
 
-            \tt "Devices" \unicode{0x2192} \tt "Execute an action" \unicode{0x2192} \tt {"Your device name (Simple Button)"} \unicode{0x2192} \tt {press the button}
+            \tt "Devices" \unicode{0x2192} \tt {"Execute an action"} \unicode{0x2192} \tt {"Your device name (Simple Button)"} \unicode{0x2192} \tt {press the button}
 
     \endlist
     
diff --git a/doc/tutorials.qdoc b/doc/tutorials.qdoc
index 0996bb03..e589fbd9 100644
--- a/doc/tutorials.qdoc
+++ b/doc/tutorials.qdoc
@@ -1,7 +1,10 @@
 /*!
     \page tutorials.html
     \title Tutorials
-    
+    \contentspage {Tutorials}
+    \nextpage {Tutorial 1 - The "Minimal" plugin}
+    \previouspage {Write your own plugin}
+
     In order to getting started with your own \l DevicePlugin it is recommanded to walk trough following tutorials to understand how the mechanism works:      
 
      \annotatedlist tutorials
diff --git a/libguh/types/eventdescriptor.cpp b/libguh/types/eventdescriptor.cpp
index b87b66de..81c10789 100644
--- a/libguh/types/eventdescriptor.cpp
+++ b/libguh/types/eventdescriptor.cpp
@@ -24,6 +24,7 @@
     \brief Describes a certain \l{Event}.
 
     \ingroup guh-types
+    \ingroup rules
     \inmodule libguh
 
     An EventDescriptor describes an \l{Event} in order to match it with a \l{guhserver::Rule}.
diff --git a/libguh/types/paramdescriptor.cpp b/libguh/types/paramdescriptor.cpp
index a204d354..be855452 100644
--- a/libguh/types/paramdescriptor.cpp
+++ b/libguh/types/paramdescriptor.cpp
@@ -24,6 +24,7 @@
     \brief Describes a certain \l{Param}.
 
     \ingroup guh-types
+    \ingroup rules
     \inmodule libguh
 
     An ParamDescriptor describes a \l{Param} in order to match it with a \l{guhserver::Rule}.
diff --git a/libguh/types/ruleaction.cpp b/libguh/types/ruleaction.cpp
index 4daf7bac..83ed06c1 100644
--- a/libguh/types/ruleaction.cpp
+++ b/libguh/types/ruleaction.cpp
@@ -24,6 +24,7 @@
     \brief Describes an action for a \l{guhserver::Rule}.
 
     \ingroup guh-types
+    \ingroup rules
     \inmodule libguh
 
     A RuleAction describes a special form of an \l{Action} for a \l{guhserver::Rule}. The main difference is
diff --git a/libguh/types/ruleactionparam.cpp b/libguh/types/ruleactionparam.cpp
index 1fbc4c20..06f2a385 100644
--- a/libguh/types/ruleactionparam.cpp
+++ b/libguh/types/ruleactionparam.cpp
@@ -24,6 +24,7 @@
     \brief Holds the parameters for a \l{RuleAction}.
 
     \ingroup guh-types
+    \ingroup rules
     \inmodule libguh
 
     A RuleActionParam allows rules to take over an \l{Event} parameter into a rule
diff --git a/libguh/types/statedescriptor.cpp b/libguh/types/statedescriptor.cpp
index a9d95569..b07f28eb 100644
--- a/libguh/types/statedescriptor.cpp
+++ b/libguh/types/statedescriptor.cpp
@@ -24,6 +24,7 @@
     \brief Describes a certain \l{State}.
 
     \ingroup guh-types
+    \ingroup rules
     \inmodule libguh
 
     An StateDescriptor describes a \l{State} in order to match it with a \l{guhserver::Rule}.
diff --git a/server/stateevaluator.cpp b/server/stateevaluator.cpp
index 8ab15591..382d9332 100644
--- a/server/stateevaluator.cpp
+++ b/server/stateevaluator.cpp
@@ -256,7 +256,6 @@ bool StateEvaluator::isValid() const
                 }
             }
         }
-
     }
 
     if (m_operatorType == Types::StateOperatorOr) {