diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/ComponentSelection.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/ComponentSelection.java
index 551d5866..faad3ecb 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/ComponentSelection.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/ComponentSelection.java	
@@ -10,6 +10,13 @@ import java.util.List;
 
 import com.diyfever.diylc.model.IComponentInstance;
 
+/**
+ * Represents component selection as a {@link List} of
+ * {@link IComponentInstance} objects. Implements {@link Transferable}, so it is
+ * suitable for clipboard usage.
+ * 
+ * @author Branislav Stojkovic
+ */
 public class ComponentSelection extends ArrayList<IComponentInstance> implements Transferable {
 
 	private static final long serialVersionUID = 1L;
diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/ControlPointWrapper.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/ControlPointWrapper.java
index fa544094..c2f80792 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/ControlPointWrapper.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/ControlPointWrapper.java	
@@ -7,6 +7,12 @@ import java.lang.reflect.Method;
 import com.diyfever.diylc.model.IComponentInstance;
 import com.diyfever.diylc.model.VisibilityPolicy;
 
+/**
+ * Entity bean that represents a control point. Has methods for reading/writing
+ * {@link Point} value from/to a component.
+ * 
+ * @author Branislav Stojkovic
+ */
 public class ControlPointWrapper {
 
 	private String name;
@@ -28,11 +34,29 @@ public class ControlPointWrapper {
 		this.visibilityPolicy = visibilityPolicy;
 	}
 
+	/**
+	 * Reads value from the specified component by invoking it's
+	 * <code>getter</code> method.
+	 * 
+	 * @param component
+	 * @throws IllegalArgumentException
+	 * @throws IllegalAccessException
+	 * @throws InvocationTargetException
+	 */
 	public void readFrom(IComponentInstance component) throws IllegalArgumentException,
 			IllegalAccessException, InvocationTargetException {
 		value = (Point) getter.invoke(component);
 	}
 
+	/**
+	 * Writes the value into the specified component by invoking it's
+	 * <code>setter</code> method.
+	 * 
+	 * @param component
+	 * @throws IllegalArgumentException
+	 * @throws IllegalAccessException
+	 * @throws InvocationTargetException
+	 */
 	public void writeTo(IComponentInstance component) throws IllegalArgumentException,
 			IllegalAccessException, InvocationTargetException {
 		setter.invoke(component, value);
diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/IPlugInPort.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/IPlugInPort.java
index 6ec15372..6ca139ed 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/IPlugInPort.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/common/IPlugInPort.java	
@@ -5,9 +5,9 @@ import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Point;
 import java.awt.geom.Area;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.swing.Action;
 import javax.swing.JComponent;
@@ -88,7 +88,7 @@ public interface IPlugInPort {
 	 * 
 	 * @param g2d
 	 */
-	void draw(Graphics2D g2d, EnumSet<DrawOption> drawProperties);
+	void draw(Graphics2D g2d, Set<DrawOption> drawProperties);
 
 	/**
 	 * Injects a custom GUI panels provided by the plug-in and desired position
diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/clipboard/ClipboardManager.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/clipboard/ClipboardManager.java
index 0f682d11..6ca9e138 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/clipboard/ClipboardManager.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/plugins/clipboard/ClipboardManager.java	
@@ -167,7 +167,7 @@ public class ClipboardManager implements IPlugIn, ClipboardOwner {
 						.getData(ComponentSelection.listFlavor);
 				plugInPort.addComponents(cloner.deepClone(components), null);
 			} catch (Exception ex) {
-				LOG.error(ex.getMessage());
+				LOG.error("Coule not paste.", ex);
 			}
 		}
 	}
diff --git a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/presenter/Presenter.java b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/presenter/Presenter.java
index b2225d56..0f1de839 100644
--- a/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/presenter/Presenter.java	
+++ b/ diy-layout-creator --username bancika@gmail.com/DIYLC/src/com/diyfever/diylc/presenter/Presenter.java	
@@ -196,7 +196,7 @@ public class Presenter implements IPlugInPort {
 	}
 
 	@Override
-	public void draw(Graphics2D g2d, EnumSet<DrawOption> drawOptions) {
+	public void draw(Graphics2D g2d, Set<DrawOption> drawOptions) {
 		if (currentProject == null) {
 			return;
 		}