diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/ICompositionContext.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/ICompositionContext.java
index c34ab99eed82164b6b355644f79faf378bb83f4a..18becd197583ca304b6c39609b3f7b11bf6ea442 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/ICompositionContext.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/ICompositionContext.java
@@ -22,10 +22,12 @@ package org.fortiss.tooling.kernel.interfaces;
  * An {@link ICompositionContext} provides additional information like drop
  * point positions to an {@link ICompositor}.
  * 
+ * @FloH: what is a "drop point" position?
+ * 
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 28A6F3DD88525F3501E5C92139AC9265
+ * @ConQAT.Rating RED Hash: D85BD49FE3F70C2C4AF5B5B9250C0863
  */
 public interface ICompositionContext {
 	// this is just a marker interface
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/ICompositor.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/ICompositor.java
index d2419075a622ff47d6fc290a2eab2033f70bc7f2..09000d1cf0fea937c522bb3b95e9d64af9dff852 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/ICompositor.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/ICompositor.java
@@ -24,6 +24,8 @@ import org.fortiss.tooling.kernel.services.IPrototypeService.Prototype;
  * Interface for compositors, i.e. classes which know how to compose
  * {@link EObject}s.
  * 
+ * @TODO: rename to "ElementCompositor"
+ * 
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IConnectionContext.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IConnectionContext.java
index 31f30d529fd12e25b6311383e8249f0e0690c60f..2307ca601c1bf00d060837a262323fdbdbbef699 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IConnectionContext.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IConnectionContext.java
@@ -22,6 +22,8 @@ package org.fortiss.tooling.kernel.interfaces;
  * An {@link IConnectionContext} provides additional information like drag point
  * positions to an {@link IConnector}.
  * 
+ * @FloH: what is a "drag point position"?
+ * 
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IConnector.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IConnector.java
index dd3c31b01a22d6766fa9a6e88817fbd2ab1c4aeb..bd85c232555e28d36013644f351bb1573337fb89 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IConnector.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IConnector.java
@@ -23,6 +23,8 @@ import org.eclipse.emf.ecore.EObject;
  * Interface for connectors, i.e. classes which connect model elements. This may
  * either be a direct connection or by using an additional connection element.
  * 
+ * @TODO: rename to "ConnectionCompositor" + make the parent explicit
+ * 
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IEObjectAware.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IEObjectAware.java
index 88b195f70b9fd56dfb27a4768bcfaddf0221243c..d791a80ce0821682512995e1a34d3d7d31a158a0 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IEObjectAware.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IEObjectAware.java
@@ -23,6 +23,8 @@ import org.fortiss.tooling.kernel.base.EObjectAwareServiceBase;
 /**
  * Abstract interface for {@link EObjectAwareServiceBase} base implementation.
  * 
+ * @TODO: a typical use is ...
+ * 
  * @author hoelzl
  * @author $Author$
  * @version $Rev$
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IEclipseResourceStorageLocationProvider.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IEclipseResourceStorageLocationProvider.java
index 80a8d028312aea160e75a332b5f74eeac19c4b59..d28997a32e7548efc1f26ccc2be7591b6515b3d5 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IEclipseResourceStorageLocationProvider.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/interfaces/IEclipseResourceStorageLocationProvider.java
@@ -23,6 +23,8 @@ import org.fortiss.tooling.kernel.internal.storage.eclipse.EclipseResourceStorag
 /**
  * Extension interface for the {@link EclipseResourceStorageProvider} mechanism.
  * 
+ * @TODO: do we really need this interface?
+ * 
  * @author hoelzlf
  * @author $Author$
  * @version $Rev$
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/package.html b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/package.html
index 885b264791db758c18df69db8ab7109c06f2a31d..99c4e9e2db54a72ade549dc93b22826b74c9d7a3 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/package.html
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/package.html
@@ -5,4 +5,6 @@
 -->
 <body>
 Implementations of the kernel services defined in the <code>kernel.services</code> package.
+<p>
+@TODO: shouldn't this package be named kernel.services.internal? + according to Eclipse naming, the internal packages should not be used by clients -- is this the case here? if not, the name 'internal' should be changed into 'impl' 
 </body>
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ExtensionPointUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ExtensionPointUtils.java
index 743dcf8a759963edd0cbd1d051bf0b42e2c9dfd9..3198f64921ab7d1ad5f79f471be06a92a21fa946 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ExtensionPointUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/ExtensionPointUtils.java
@@ -39,7 +39,7 @@ import org.osgi.framework.Bundle;
  * @author hummel
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 05174A663568D6A53F98A21704CDBCA5
+ * @ConQAT.Rating GREEN Hash: 9EFBA1C989BEFB70A825EC0F299A0B46
  */
 public class ExtensionPointUtils {
 
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/LoggingUtils.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/LoggingUtils.java
index 74fd461683812613b3b5dce1e817a7a0309ec033..d096571b2029be43823100a2f97c3ae0444add93 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/LoggingUtils.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/util/LoggingUtils.java
@@ -32,7 +32,7 @@ import org.eclipse.core.runtime.Status;
  * @author schwitze
  * @author $Author$
  * @version $Rev$
- * @ConQAT.Rating YELLOW Hash: 27FE1FF60B7FF5F94B1619BE297E4036
+ * @ConQAT.Rating GREEN Hash: 5489A04000105CF881046928C19E6E14
  */
 public class LoggingUtils {