Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/formatting/EbnfFormatter.java
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/formatting/EbnfFormatter.java	(revision 61)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/formatting/EbnfFormatter.java	(revision 63)
@@ -8,4 +8,5 @@
 import org.eclipse.xtext.IGrammarAccess;
 import org.eclipse.xtext.ParserRule;
+import org.eclipse.xtext.RuleCall;
 import org.eclipse.xtext.TerminalRule;
 import org.eclipse.xtext.formatting.impl.AbstractDeclarativeFormatter;
@@ -45,4 +46,8 @@
     ParserRule _importRule = f.getImportRule();
     _setLinewrap_4.before(_importRule);
+    FormattingConfig.NoSpaceLocator _setNoSpace = c.setNoSpace();
+    EbnfGrammarAccess.RuleElements _ruleAccess = f.getRuleAccess();
+    RuleCall _rulenumberINTTerminalRuleCall_0_0_0 = _ruleAccess.getRulenumberINTTerminalRuleCall_0_0_0();
+    _setNoSpace.after(_rulenumberINTTerminalRuleCall_0_0_0);
   }
 }
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.java
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.java	(revision 61)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/generator/EbnfGenerator.java	(revision 63)
@@ -56,6 +56,12 @@
     _builder.append("<?xml version=\"1.0\"?>");
     _builder.newLine();
-    _builder.append("<!-- fop hello.xml -rtf hello.rtf -->");
-    _builder.newLine();
+    _builder.append("<!-- fop ");
+    String _name = bnf.getName();
+    _builder.append(_name, "");
+    _builder.append(".xml -rtf ");
+    String _name_1 = bnf.getName();
+    _builder.append(_name_1, "");
+    _builder.append(".rtf -->");
+    _builder.newLineIfNotEmpty();
     _builder.append("<fo:root xmlns:fo=\"http://www.w3.org/1999/XSL/Format\">");
     _builder.newLine();
@@ -123,4 +129,13 @@
     _builder.append(_name, "");
     _builder.append("\"\tcolor=\"purple\">");
+    {
+      int _rulenumber = rule.getRulenumber();
+      boolean _notEquals = (_rulenumber != 0);
+      if (_notEquals) {
+        int _rulenumber_1 = rule.getRulenumber();
+        _builder.append(_rulenumber_1, "");
+        _builder.append(".\\t");
+      }
+    }
     String _name_1 = rule.getName();
     _builder.append(_name_1, "");
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/scoping/EbnfScopeProvider.java
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/scoping/EbnfScopeProvider.java	(revision 61)
+++ 	(revision )
@@ -1,16 +1,0 @@
-/**
- * generated by Xtext
- */
-package de.ugoe.cs.swe.bnftools.scoping;
-
-import org.eclipse.xtext.scoping.impl.AbstractDeclarativeScopeProvider;
-
-/**
- * This class contains custom scoping description.
- * 
- * see : http://www.eclipse.org/Xtext/documentation.html#scoping
- * on how and when to use it
- */
-@SuppressWarnings("all")
-public class EbnfScopeProvider extends AbstractDeclarativeScopeProvider {
-}
Index: v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/validation/EbnfValidator.java
===================================================================
--- v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/validation/EbnfValidator.java	(revision 61)
+++ v2/trunk/de.ugoe.cs.swe.bnftools.ebnf/xtend-gen/de/ugoe/cs/swe/bnftools/validation/EbnfValidator.java	(revision 63)
@@ -26,17 +26,17 @@
 @SuppressWarnings("all")
 public class EbnfValidator extends AbstractEbnfValidator {
-  private final static String ruleReferencedOneDescription = "The rule is only referenced by one other rule";
-  
-  private final static String passthroughRuleDescription = "The rule is a passthrough rule";
-  
-  private final static String unreferencedPassthroughRuleDescription = "The rule is an unreferenced passthrough rule";
-  
-  private final static String unusedRuleDescription = "The rule is not referenced anywhere";
-  
-  private final static String equalAlternativeDescription = "The rule contains equal alternatives";
-  
-  private final static String duplicateRulesDescription = "The rule is a duplicate";
-  
-  private final static String nonUniqueNameDescription = "The rule has the same Name as the Rule in Line ";
+  public final static String ruleReferencedOneDescription = "The rule is only referenced by one other rule";
+  
+  public final static String passthroughRuleDescription = "The rule is a passthrough rule";
+  
+  public final static String unreferencedPassthroughRuleDescription = "The rule is an unreferenced passthrough rule";
+  
+  public final static String unusedRuleDescription = "The rule is not referenced anywhere";
+  
+  public final static String equalAlternativeDescription = "The rule contains equal alternatives";
+  
+  public final static String duplicateRulesDescription = "The rule is a duplicate";
+  
+  public final static String nonUniqueNameDescription = "The rule has the same Name as the Rule in Line ";
   
   /**
@@ -63,5 +63,6 @@
     }
     if (_and) {
-      this.warning(EbnfValidator.ruleReferencedOneDescription, EbnfPackage.Literals.RULE__NAME);
+      String _name = rule.getName();
+      this.warning(EbnfValidator.ruleReferencedOneDescription, EbnfPackage.Literals.RULE__NAME, EbnfValidator.ruleReferencedOneDescription, _name);
     }
   }
@@ -158,5 +159,6 @@
     }
     if (_and) {
-      this.warning(EbnfValidator.unusedRuleDescription, EbnfPackage.Literals.RULE__NAME);
+      String _name = rule.getName();
+      this.warning(EbnfValidator.unusedRuleDescription, EbnfPackage.Literals.RULE__NAME, EbnfValidator.unusedRuleDescription, _name);
     }
   }