diff --git a/plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/transform/AbstractTranslator.java b/plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/transform/AbstractTranslator.java
index 39d497eaff823fb3ca8011edca37325d21628727..eaab3188699a038385ab2531033418e54d2c9cfd 100644
--- a/plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/transform/AbstractTranslator.java
+++ b/plugins/org.etsi.mts.tdl.common/src/org/etsi/mts/tdl/transform/AbstractTranslator.java
@@ -87,10 +87,11 @@ public abstract class AbstractTranslator {
 	public static String cleanName(String name) {
 		//TODO: use keywords filter?
 //		List<String> keywords = List.of("Message", "Time", "Type", "type", "name", "instance", "size", "component");
-		List<String> keywords = List.of("Message", "Time", "Type", "instance", "size", "component");
-		if (keywords.contains(name)) {
-			name = "^"+name;
-		}
+		//TODO: is this redundant now for TDLtx?
+//		List<String> keywords = List.of("Message", "Time", "Type", "instance", "size", "component");
+//		if (keywords.contains(name)) {
+//			name = "^"+name;
+//		}
 		name = name.replaceAll("-", "_")
 				.replaceAll(" ", "_")
 				.replaceAll(":", "_")
diff --git a/plugins/org.etsi.mts.tdl.constraints.ui/src/org/etsi/mts/tdl/constraints/ui/handlers/.project b/plugins/org.etsi.mts.tdl.constraints.ui/src/org/etsi/mts/tdl/constraints/ui/handlers/.project
deleted file mode 100644
index b6e59aeba9ddff4fee3c1a4e3e4589e2703bb2cd..0000000000000000000000000000000000000000
--- a/plugins/org.etsi.mts.tdl.constraints.ui/src/org/etsi/mts/tdl/constraints/ui/handlers/.project
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><projectDescription><name>DUMMY</name><comment></comment><projects></projects><buildSpec></buildSpec><natures></natures></projectDescription>
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.importers.ui/src/org/etsi/mts/tdl/importers/ui/handlers/.project b/plugins/org.etsi.mts.tdl.importers.ui/src/org/etsi/mts/tdl/importers/ui/handlers/.project
deleted file mode 100644
index b6e59aeba9ddff4fee3c1a4e3e4589e2703bb2cd..0000000000000000000000000000000000000000
--- a/plugins/org.etsi.mts.tdl.importers.ui/src/org/etsi/mts/tdl/importers/ui/handlers/.project
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><projectDescription><name>DUMMY</name><comment></comment><projects></projects><buildSpec></buildSpec><natures></natures></projectDescription>
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.model/model/tdl-constraints.ocl b/plugins/org.etsi.mts.tdl.model/model/tdl-constraints.ocl
index 6bc9670bce411dcbc698b997ae450d48a4ef8175..dd5183042bbd4a3023fdbeb8a82b1371f289c168 100644
--- a/plugins/org.etsi.mts.tdl.model/model/tdl-constraints.ocl
+++ b/plugins/org.etsi.mts.tdl.model/model/tdl-constraints.ocl
@@ -420,6 +420,8 @@ context DataElementUse
 
   -- Matching parameters for 'Function's
   inv FunctionCallParameters ('All \'FormalParameter\'s shall be bound if the \'dataElement\' refers to a \'Function\'.' + self.toString()):
+        self.dataElement.oclIsUndefined()
+        or 
         not self.dataElement.oclIsKindOf(Function)
       or self.dataElement.oclAsType(Function).formalParameter->forAll(p | self.argument->exists(a | a.parameter = p))
   
diff --git a/plugins/org.etsi.mts.tdl.rt.ui/src/org/etsi/mts/tdl/tools/rt/ui/handlers/.project b/plugins/org.etsi.mts.tdl.rt.ui/src/org/etsi/mts/tdl/tools/rt/ui/handlers/.project
deleted file mode 100644
index b6e59aeba9ddff4fee3c1a4e3e4589e2703bb2cd..0000000000000000000000000000000000000000
--- a/plugins/org.etsi.mts.tdl.rt.ui/src/org/etsi/mts/tdl/tools/rt/ui/handlers/.project
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><projectDescription><name>DUMMY</name><comment></comment><projects></projects><buildSpec></buildSpec><natures></natures></projectDescription>
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.tools.to.docx.poi.ui/src/org/etsi/mts/tdl/tools/to/docx/poi/ui/handlers/.project b/plugins/org.etsi.mts.tdl.tools.to.docx.poi.ui/src/org/etsi/mts/tdl/tools/to/docx/poi/ui/handlers/.project
deleted file mode 100644
index b6e59aeba9ddff4fee3c1a4e3e4589e2703bb2cd..0000000000000000000000000000000000000000
--- a/plugins/org.etsi.mts.tdl.tools.to.docx.poi.ui/src/org/etsi/mts/tdl/tools/to/docx/poi/ui/handlers/.project
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><projectDescription><name>DUMMY</name><comment></comment><projects></projects><buildSpec></buildSpec><natures></natures></projectDescription>
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.ttcn3.ui/src/org/etsi/mts/tdl/ttcn3/ui/handlers/.project b/plugins/org.etsi.mts.tdl.ttcn3.ui/src/org/etsi/mts/tdl/ttcn3/ui/handlers/.project
deleted file mode 100644
index b6e59aeba9ddff4fee3c1a4e3e4589e2703bb2cd..0000000000000000000000000000000000000000
--- a/plugins/org.etsi.mts.tdl.ttcn3.ui/src/org/etsi/mts/tdl/ttcn3/ui/handlers/.project
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><projectDescription><name>DUMMY</name><comment></comment><projects></projects><buildSpec></buildSpec><natures></natures></projectDescription>
\ No newline at end of file
diff --git a/plugins/org.etsi.mts.tdl.tx/src/org/etsi/mts/tdl/TDLtx.xtext b/plugins/org.etsi.mts.tdl.tx/src/org/etsi/mts/tdl/TDLtx.xtext
index e05c666c776c2785683dcf72d553ddfd429ae55e..6d1f229f3c71ee5ff2c72dfae46478fdb89d2c38 100644
--- a/plugins/org.etsi.mts.tdl.tx/src/org/etsi/mts/tdl/TDLtx.xtext
+++ b/plugins/org.etsi.mts.tdl.tx/src/org/etsi/mts/tdl/TDLtx.xtext
@@ -1156,6 +1156,7 @@ CommonWordQualifier returns tdl::Comment:
     | body='from' 
     | body='to' 
     | body='of'
+    | body='start'
 ;
 
 DirectionQualifier returns tdl::Comment:
diff --git a/plugins/org.etsi.mts.tdl.wizards/src/org/etsi/mts/tdl/wizards/importWizards/ImportWizardPage.java b/plugins/org.etsi.mts.tdl.wizards/src/org/etsi/mts/tdl/wizards/importWizards/ImportWizardPage.java
index cb4c3d56ec93db4db13f8353b0ca881f495de6ce..fc4d17f8d6c7fad0e7d940b66ca0759279c2ab9b 100644
--- a/plugins/org.etsi.mts.tdl.wizards/src/org/etsi/mts/tdl/wizards/importWizards/ImportWizardPage.java
+++ b/plugins/org.etsi.mts.tdl.wizards/src/org/etsi/mts/tdl/wizards/importWizards/ImportWizardPage.java
@@ -182,12 +182,16 @@ public class ImportWizardPage extends WizardNewFileCreationPage {
 	protected boolean validatePage() {
 		boolean validatePage = super.validatePage();
 		//basic check for referenced data file
-		IPath sourcePath = Path.fromOSString(this.editor.getStringValue());
-		boolean exists = sourcePath.toFile().exists();
-		if (!exists) {
-			setErrorMessage("The selected data file path is not valid.");
+		if (this.editor != null) {
+			IPath sourcePath = Path.fromOSString(this.editor.getStringValue());
+			boolean exists = sourcePath.toFile().exists();
+			if (!exists) {
+				setErrorMessage("The selected data file path is not valid.");
+			}
+			return exists && validatePage;
+		} else {
+			return false;
 		}
-		return exists && validatePage;
 	}
 	
 	private void flattenDataDefinitions(SelectionEvent e) {