Index: trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/Event.java
===================================================================
--- trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/Event.java	(revision 2182)
+++ trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/Event.java	(revision 2218)
@@ -30,6 +30,4 @@
  * @version 1.0
  * 
- * @param <T>
- *            Can be used to declare that events belong to a specific platform without subclassing.
  */
 public final class Event implements Serializable {
@@ -86,5 +84,5 @@
      * <p>
      * List of {@link IReplayable}s of type T that describes the replay of an event. The
-     * {@link IReplayable}s can be interpreted as <it>sub-events</it> on the platform level that
+     * {@link IReplayable}s can be interpreted as sub-events on the platform level that
      * make up the abstract event.
      * </p>
Index: trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/HierarchicalEventTargetTree.java
===================================================================
--- trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/HierarchicalEventTargetTree.java	(revision 2182)
+++ trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/HierarchicalEventTargetTree.java	(revision 2218)
@@ -25,11 +25,11 @@
 /**
  * <p>
- * This class provides the interfaces for GUI element trees.
+ * This class provides the interfaces for hierarchical event target trees.
  * </p>
  * <p>
- * The GUIElementTree represents the hierarchical structure of the GUI elements "as it is"
- * currently during a session. It may change during the session due to creation and destruction
- * of GUI elements. The parameter T represents the id type of the GUI elements that are handled
- * internally.
+ * The HierarchicalEventTargetTree represents the hierarchical structure of the event targets
+ * "as it is" currently during a session. It may change during the session due to creation and
+ * destruction of event targets. The parameter ID represents the id type of the event targets
+ * that are handled internally. The other type parameters specify the concrete target type.
  * </p>
  * 
@@ -44,6 +44,6 @@
     /**
      * <p>
-     * Map of all GUI elements that are part of the tree for efficient searching. The keys of the
-     * map are the ids of the GUI elements.
+     * Map of all event targets that are part of the tree for efficient searching. The keys of the
+     * map are the ids of the event targets.
      * </p>
      */
@@ -52,6 +52,6 @@
     /**
      * <p>
-     * Map of all GUI element specifications that are part of the tree for efficient searching. The
-     * keys of the map are the ids of the GUI elements.
+     * Map of all event target specifications that are part of the tree for efficient searching. The
+     * keys of the map are the ids of the event targets.
      * </p>
      */
@@ -60,6 +60,6 @@
     /**
      * <p>
-     * Map of all children of GUI elements that are part of the tree. The keys of the map are the
-     * ids of the parent GUI elements.
+     * Map of all children of event targets that are part of the tree. The keys of the map are the
+     * ids of the parent event targets.
      * </p>
      */
@@ -68,6 +68,6 @@
     /**
      * <p>
-     * Map of all parents of GUI elements that are part of the tree. The keys of the map are the
-     * ids of the child GUI elements.
+     * Map of all parents of event targets that are part of the tree. The keys of the map are the
+     * ids of the child event targets.
      * </p>
      */
@@ -83,5 +83,5 @@
     /**
      * <p>
-     * the GUI element factory used in the model
+     * the event target factory used in the model
      * </p>
      */
@@ -106,15 +106,15 @@
     /**
      * <p>
-     * Adds a new GUI element to the tree.
+     * Adds a new event target to the tree.
      * </p>
      * 
      * @param eventTargetID
-     *            id of the GUI element to be created
+     *            id of the event target to be created
      * @param parentID
-     *            id of the parent GUI element 
+     *            id of the parent event target 
      * @param eventTargetSpec
-     *            the GUI element specification
+     *            the event target specification
      *            
-     * @throws EventTargetModelException if the GUI element can not be added to the underlying GUI model
+     * @throws EventTargetModelException if the event target can not be added to the underlying GUI model
      */
     public void add(ID               eventTargetID,
@@ -159,5 +159,5 @@
     /**
      * <p>
-     * Searches the tree for a GUI element with the specified id and returns its
+     * Searches the tree for a event target with the specified id and returns its
      * {@link IGUIElement} .
      * </p>
@@ -165,5 +165,5 @@
      * @param id
      *            id that is looked for
-     * @return {@link IGUIElementSpec} of the GUI element with the given id if found, null otherwise
+     * @return {@link IEventTargetSpec} of the event target with the given id if found, null otherwise
      */
     public TARGET_TYPE find(ID id) {
@@ -173,11 +173,11 @@
     /**
      * <p>
-     * Returns the id of the provided {@link IGUIElement}. The comparison is performed using the
-     * equals method of the GUI element.
+     * Returns the id of the provided {@link IHierachicalEventTarget}. The comparison is performed using the
+     * equals method of the event target.
      * </p>
      * 
      * @param eventTarget
      *            guiElement that is looked for
-     * @return the id of the GUI element, null if the GUI element can not be found
+     * @return the id of the event target, null if the event target can not be found
      */
     public ID find(TARGET_TYPE eventTarget) {
@@ -193,11 +193,11 @@
     /**
      * <p>
-     * Removes a GUI element (defined by its id) from the tree. All children of the GUI element will be
+     * Removes a event target (defined by its id) from the tree. All children of the event target will be
      * removed recursively.
      * </p>
      * 
      * @param id
-     *            id of the GUI element to be removed
-     * @return number of GUI elements that were removed
+     *            id of the event target to be removed
+     * @return number of event targets that were removed
      */
     public int remove(ID id) {
Index: trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/IReplayable.java
===================================================================
--- trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/IReplayable.java	(revision 2182)
+++ trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/IReplayable.java	(revision 2218)
@@ -21,5 +21,5 @@
 /**
  * <p>
- * This interface is used by {@link ReplayableEvent}to describe how events can
+ * This interface is used by replayable events to describe how events can
  * be replayed. It can be used to define a sequence of fine-grained platform
  * events that make up an abstract event.
Index: trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/KeyInteractionCorrector.java
===================================================================
--- trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/KeyInteractionCorrector.java	(revision 2182)
+++ trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/gui/KeyInteractionCorrector.java	(revision 2218)
@@ -30,4 +30,5 @@
  * This class provides the functionality to sort and clean up all key interactions in a log. In
  * particular:
+ * </p>
  * <ol>
  * <li>In case a combination key (e.g., shift, alt, control) is held down, multiple
@@ -48,5 +49,4 @@
  * events for all combination keys.</li>
  * </ol>
- * </p>
  * 
  * @version 1.0
Index: trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementGroup.java
===================================================================
--- trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementGroup.java	(revision 2182)
+++ trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIElementGroup.java	(revision 2218)
@@ -41,7 +41,7 @@
      * </p>
      *
-     * @param groupName        the name of the GUI element group
-     * @param parent           the optional parent GUI element of the group
-     * @param eventTargetModel the GUI model to which the group will belong
+     * @param groupName  the name of the GUI element group
+     * @param parent     the optional parent GUI element of the group
+     * @param guiModel   the GUI model to which the group will belong
      */
     public GUIElementGroup(String      groupName,
Index: trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIModel.java
===================================================================
--- trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIModel.java	(revision 2182)
+++ trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/GUIModel.java	(revision 2218)
@@ -22,5 +22,5 @@
 /**
  * <p>
- * A GUI model is a tree of {@link IGUIElements} and represents a complete GUI of a software. It is
+ * A GUI model is a tree of {@link IGUIElement}s and represents a complete GUI of a software. It is
  * platform independent. It may have several root nodes, as some GUIs are made up of several Frames
  * being independent from each other. The GUI model is filled using the
Index: trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/IGUIElement.java
===================================================================
--- trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/IGUIElement.java	(revision 2182)
+++ trunk/autoquest-core-events/src/main/java/de/ugoe/cs/autoquest/eventcore/guimodel/IGUIElement.java	(revision 2218)
@@ -107,5 +107,5 @@
      * </p>
      * 
-     * @param guiElement
+     * @param otherElement
      *            the GUI element to measure the distance for
      */