diff --git a/.bzrignore b/.bzrignore
index 4266a76f2f41efd101a294740548b1e53fee2002..8e820b5694ce1c914698f29d044359b425075b84 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -10,3 +10,5 @@ siaras/Siaras.ast
 siaras/log.tmp
 *Jambalaya.properties
 siaras/GeneratedAspects.jrag
+testontologies/*.xmi
+testontologies/*.pprj
diff --git a/CompilerGeneration.jrag b/CompilerGeneration.jrag
index ce6772f61cfc8bdfe12a0863de14e893bfed1057..39fb59c63a05b578f4f86668796671159e4fd0e0 100644
--- a/CompilerGeneration.jrag
+++ b/CompilerGeneration.jrag
@@ -213,6 +213,7 @@ aspect GenRewrites {
 	public void OwlClassDecl.genRewrites(PrintStream pStream) {
 		String ind = "  ";
 		int ix = 0;
+		// Specialize ComplexElements to the actual class in the ontology
 		pStream.println(ind(1)+"rewrite ComplexElement {");
 		pStream.println(ind(2)+"when (getOwlIdentifier().getIDENTIFIER().equals(\""+
 						name()+"\") && !(this instanceof Thing))");
@@ -250,6 +251,8 @@ aspect GenRewrites {
 		pStream.println(ind(3)+"return node;");
 		pStream.println(ind(2)+"}");
 		pStream.println(ind(1)+"}");
+		// Rearrange device nodes on the AST to get away from the
+		// current diagonal style from Protege
 	}
 
 }
diff --git a/siaras/Siaras.jjt b/siaras/Siaras.jjt
index 55d562f9edeec3e30f1182bf3c6ac08a763295a0..47f2cd10564466c5931e62305cdc4aaacc88fe9a 100644
--- a/siaras/Siaras.jjt
+++ b/siaras/Siaras.jjt
@@ -175,7 +175,7 @@ SPECIAL_TOKEN : /* COMMENTS */
 
 <DEFAULT, BOUNDS> TOKEN : /* IDENTIFIERS */
 {
-    < IDENTIFIER: <LETTER> (<LETTER>|<DIGIT>)* >
+    < IDENTIFIER: <LETTER> (<LETTER>|<DIGIT>|":")* >
     |
     < #LETTER:
         [
@@ -194,7 +194,9 @@ SPECIAL_TOKEN : /* COMMENTS */
         "\uf900"-"\ufaff",
 		"+",
 		"-",
-		"/"
+		"/",
+		",",
+		"."
         ]
     >
     |
@@ -228,8 +230,8 @@ SPECIAL_TOKEN : /* COMMENTS */
     | < LBRACKET             : "["    >
     | < RBRACKET             : "]"    >
     | < SEMICOLON            : ";"    >
-	| < COMMA                : ","    >
-    | < DOT                  : "."    >
+// 	| < COMMA                : ","    >
+//     | < DOT                  : "."    >
 }// SEPARATORS