diff --git a/CompilerGeneration.jrag b/CompilerGeneration.jrag
index 42eb2ffa46938c3fde1bbac0286611a132dda621..1bb803db84ac87058033abef7d09e44e4a6305d2 100644
--- a/CompilerGeneration.jrag
+++ b/CompilerGeneration.jrag
@@ -15,7 +15,7 @@ aspect AbsGrammarGeneration {
 		pStream.println("Start ::= ComplexElement;");
 		pStream.println("abstract Thing ::=;");
 		pStream.println("abstract Element;");
- 		pStream.println("ComplexElement ::=  OwlIdentifier Attribute* Element*;");
+ 		pStream.println("ComplexElement : Element ::=  OwlIdentifier Attribute* Element*;");
 // 		pStream.println("ComplexElement ::=  id1:OwlIdentifier id2:OwlIdentifier;");
 		pStream.println("abstract SimpleElement : Element;");
 		pStream.println("StringElement : SimpleElement ::= <IDENTIFIER>;");
diff --git a/siaras/Siaras.jjt b/siaras/Siaras.jjt
index 2f21fdef7007ac3f8014620adf0dabdb89413eee..dc337550909e13c4c120dd518a1ab0d3d54544a0 100644
--- a/siaras/Siaras.jjt
+++ b/siaras/Siaras.jjt
@@ -236,6 +236,7 @@ SPECIAL_TOKEN : /* COMMENTS */
       < ASSIGN               : "="    >
      | < GT                   : ">"    >
      | < LT                   : "<"    >
+     | < END_TAG              : "/>"   >
 //     | < BANG                 : "!"    >
 //     | < TILDE                : "~"    >
 //     | < HOOK                 : "?"    >
@@ -273,10 +274,14 @@ SPECIAL_TOKEN : /* COMMENTS */
 }// OPERATORS
 
 
-// <DEFAULT,BOUNDS> TOKEN : /* TEXT */
-// {
-//     < TEXT : <LETTER> (~["<",">"])*    >
-// }// TEXT
+<DEFAULT,BOUNDS> TOKEN : /* TEXT */
+{
+    < VALUE_LITERAL:
+        (<LETTER> | <DIGIT>) ( ~["<"] )*
+    >
+}// TEXT
+
+
 
 
 //--------------------------------------------------------------------//
@@ -359,7 +364,7 @@ void FloatElement() #FloatElement : { Token t; }
 
 void StringElement() #StringElement : { Token t; }
 {
-    t = <IDENTIFIER>
+    t = <VALUE_LITERAL>
 	{jjtThis.setIDENTIFIER(t.image);}
 }