diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ComponentDescriptor.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ComponentDescriptor.java
index 8e1444e3..9527a74e 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ComponentDescriptor.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ComponentDescriptor.java	
@@ -5,7 +5,6 @@ import java.lang.annotation.RetentionPolicy;
 
 import org.diylc.core.ComponentLayer;
 import org.diylc.core.IDIYComponent;
-import org.diylc.core.VisibilityPolicy;
 
 /**
  * Annotation for {@link IDIYComponent} implementation. Describes component
@@ -15,18 +14,55 @@ import org.diylc.core.VisibilityPolicy;
  */
 @Retention(RetentionPolicy.RUNTIME)
 public @interface ComponentDescriptor {
-	
+
+	/**
+	 * Component type name.
+	 * 
+	 * @return
+	 */
 	String name();
-	
+
+	/**
+	 * Component type description.
+	 * 
+	 * @return
+	 */
 	String desciption();
-	
+
+	/**
+	 * Component category, e.g. "Passive" or "Semiconductors".
+	 * 
+	 * @return
+	 */
 	String category();
-	
+
+	/**
+	 * Component author name.
+	 * 
+	 * @return
+	 */
 	String author();
-	
+
+	/**
+	 * Prefix that will be used to generate component instance names, e.g. "R"
+	 * for resistors or "Q" for transistors.
+	 * 
+	 * @return
+	 */
 	String instanceNamePrefix();
-	
+
+	/**
+	 * Z-order of the component.
+	 * 
+	 * @return
+	 */
 	ComponentLayer componentLayer() default ComponentLayer.COMPONENT;
 
+	/**
+	 * When false, moving one control point will cause all the others to move
+	 * together with it.
+	 * 
+	 * @return
+	 */
 	boolean stretchable() default true;
 }
diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ControlPoint.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ControlPoint.java
index c734a491..52408243 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ControlPoint.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/core/annotations/ControlPoint.java	
@@ -38,12 +38,4 @@ public @interface ControlPoint {
 	 * @return
 	 */
 	boolean sticky() default true;
-
-	// /**
-	// * If true, the control point is the main control point for the component.
-	// * There cannot be more than one control point for a single component.
-	// *
-	// * @return
-	// */
-	// boolean main() default false;
 }
diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentButton.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentButton.java
index b753ca27..bf03a2b6 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentButton.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/org/diylc/plugins/toolbox/ComponentButton.java	
@@ -28,8 +28,9 @@ class ComponentButton extends JButton {
 		this.plugInPort = plugInPort;
 		this.componentType = componentType;
 
-		setToolTipText("<html><b>" + componentType.getName() + "</b><br><br>"
-				+ componentType.getDescription() + "</html>");
+		setToolTipText("<html><b>" + componentType.getName() + "</b><br>"
+				+ componentType.getDescription() + "<br>Author: " + componentType.getAuthor()
+				+ "</html>");
 		// initializeDnD();
 		addActionListener(new ActionListener() {