diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/SignalFigure.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/SignalFigure.java
index 7e5752eb3dd61ce8e05543f1e93385539eccfd2c..052554a54b80675119080156d503d09a3fbb9d86 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/SignalFigure.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/SignalFigure.java
@@ -84,7 +84,6 @@ public class SignalFigure extends AbstractBMotionFigure {
 
 				p1.y = p1.y + 4;
 				p2.y = p2.y + 8;
-				p3.y = p3.y;
 
 				arrow.addPoint(p1);
 				arrow.addPoint(p2);
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/Visualization.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/Visualization.java
index 11fa44fc0d621e8e574f762b3d7bcb1dcc554341..25c7b759fbef6beb61d65abf17e92b06c138efcb 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/Visualization.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/model/Visualization.java
@@ -172,11 +172,11 @@ public class Visualization extends BControl {
 				return control;
 			}
 			for (BConnection c : control.getSourceConnections()) {
-				if (c.getIcon().equals(ID))
+				if (c.getID().equals(ID))
 					return c;
 			}
 			for (BConnection c : control.getTargetConnections()) {
-				if (c.getIcon().equals(ID))
+				if (c.getID().equals(ID))
 					return c;
 			}
 			if (control.getChildrenArray().size() > 0) {
diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/TableObserver.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/TableObserver.java
index 2e33d00a09ac400c41482e1726fb11990b6c2c3e..889da54b37ad66ff6ecc74e563dae9b21da6d18a 100644
--- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/TableObserver.java
+++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/observer/TableObserver.java
@@ -101,34 +101,33 @@ public class TableObserver extends Observer {
 
 				String content = rows.get(i - numberOfOldRows);
 
-				if (content != null && content.length() > 0)
+				if (content != null && content.length() > 0) {
 					content = UnicodeTranslator.toAscii(content);
-
-				content = content.replaceAll("^\\(", "");
-				content = content.replaceAll("\\)$", "");
-
-				List<String> columns = split2(content, '#');
-				int numberOfNewColumns = columns.size();
-
-				// Set only one time the number of columns!
-				if (!setColumns) {
-					int ncolumns = numberOfNewColumns;
-					if (numberOfOldColumns > numberOfNewColumns)
-						ncolumns = numberOfOldColumns;
-					control.setAttributeValue(
-							AttributeConstants.ATTRIBUTE_COLUMNS, ncolumns,
-							true, false);
-					setColumns = true;
-				}
-
-				for (int z = 0; z < numberOfNewColumns; z++) {
-					String val = columns.get(z);
-					BControl column = control.getChildrenArray().get(z);
-					BControl cell = column.getChildrenArray().get(i);
-					if (val != null && val.length() > 0)
-						val = UnicodeTranslator.toUnicode(val);
-					cell.setAttributeValue(AttributeConstants.ATTRIBUTE_TEXT,
-							val);
+					content = content.replaceAll("^\\(", "");
+					content = content.replaceAll("\\)$", "");
+					List<String> columns = split2(content, '#');
+					int numberOfNewColumns = columns.size();
+
+					// Set only one time the number of columns!
+					if (!setColumns) {
+						int ncolumns = numberOfNewColumns;
+						if (numberOfOldColumns > numberOfNewColumns)
+							ncolumns = numberOfOldColumns;
+						control.setAttributeValue(
+								AttributeConstants.ATTRIBUTE_COLUMNS, ncolumns,
+								true, false);
+						setColumns = true;
+					}
+
+					for (int z = 0; z < numberOfNewColumns; z++) {
+						String val = columns.get(z);
+						BControl column = control.getChildrenArray().get(z);
+						BControl cell = column.getChildrenArray().get(i);
+						if (val != null && val.length() > 0)
+							val = UnicodeTranslator.toUnicode(val);
+						cell.setAttributeValue(
+								AttributeConstants.ATTRIBUTE_TEXT, val);
+					}
 				}
 
 			}