diff --git a/pmd-modelica/pom.xml b/pmd-modelica/pom.xml
index 3993c84a4c..42b1b7703d 100644
--- a/pmd-modelica/pom.xml
+++ b/pmd-modelica/pom.xml
@@ -65,10 +65,6 @@
         </plugins>
     </build>
     <dependencies>
-        <dependency>
-            <groupId>org.antlr</groupId>
-            <artifactId>antlr4-runtime</artifactId>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.pmd</groupId>
             <artifactId>pmd-core</artifactId>
diff --git a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTClassDefinition.java b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTClassDefinition.java
index 9a7fd3eae8..886c279315 100644
--- a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTClassDefinition.java
+++ b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTClassDefinition.java
@@ -11,11 +11,11 @@ public class ASTClassDefinition extends AbstractModelicaNode {
     private ModelicaClassSpecialization specialization;
     private ModelicaClassSpecifierNode specifier;
 
-    public ASTClassDefinition(int id) {
+    ASTClassDefinition(int id) {
         super(id);
     }
 
-    public ASTClassDefinition(ModelicaParser p, int id) {
+    ASTClassDefinition(ModelicaParser p, int id) {
         super(p, id);
     }
 
diff --git a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTElementList.java b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTElementList.java
index 52831570c4..b25bb493c6 100644
--- a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTElementList.java
+++ b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTElementList.java
@@ -7,11 +7,11 @@ package net.sourceforge.pmd.lang.modelica.ast;
 public class ASTElementList extends AbstractModelicaNode {
     private Visibility visibility;
 
-    public ASTElementList(int id) {
+    ASTElementList(int id) {
         super(id);
     }
 
-    public ASTElementList(ModelicaParser p, int id) {
+    ASTElementList(ModelicaParser p, int id) {
         super(p, id);
     }
 
diff --git a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTStoredDefinition.java b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTStoredDefinition.java
index 886c7ec9c1..247d400c2b 100644
--- a/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTStoredDefinition.java
+++ b/pmd-modelica/src/main/java/net/sourceforge/pmd/lang/modelica/ast/ASTStoredDefinition.java
@@ -4,12 +4,13 @@
 
 package net.sourceforge.pmd.lang.modelica.ast;
 
+import net.sourceforge.pmd.lang.ast.RootNode;
 import net.sourceforge.pmd.lang.modelica.resolver.CompositeName;
 
 /**
  * A representation of a Modelica source code file.
  */
-public class ASTStoredDefinition extends AbstractModelicaNode {
+public class ASTStoredDefinition extends AbstractModelicaNode implements RootNode {
     private boolean hasBOM = false;
 
     ASTStoredDefinition(int id) {
diff --git a/pmd-modelica/src/main/resources/category/modelica/bestpractices.xml b/pmd-modelica/src/main/resources/category/modelica/bestpractices.xml
index d121417e26..fb1bcfde9e 100644
--- a/pmd-modelica/src/main/resources/category/modelica/bestpractices.xml
+++ b/pmd-modelica/src/main/resources/category/modelica/bestpractices.xml
@@ -11,6 +11,7 @@ Rules which enforce generally accepted best practices.
     <rule name="ClassStartNameEqualsEndName"
           language="modelica"
           message="Class ends with an end clause with a different name"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_modelica_bestpractices.html#classstartnameequalsendname"
           class="net.sourceforge.pmd.lang.rule.XPathRule">
         <description>
             Having a class starting with some name and some *different*
@@ -27,27 +28,82 @@ Rules which enforce generally accepted best practices.
                 </value>
             </property>
         </properties>
+        <example>
+<![CDATA[
+model SomeName
+  Real x;
+equation
+  x = 1;
+end SomeOtherName /* should be SomeName */;
+]]>
+        </example>
     </rule>
 
     <rule name="ConnectUsingNonConnector"
           language="modelica"
           message="Arguments passed to `connect` should be connectors, not `{0}`"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_modelica_bestpractices.html#connectusingnonconnector"
           class="net.sourceforge.pmd.lang.modelica.rule.ConnectUsingNonConnector">
         <description>
             Modelica specification requires passing connectors to the `connect` clause,
             while some implementations tolerate using it on plain variables, etc..
         </description>
         <priority>2</priority>
+        <example>
+<![CDATA[
+package Example
+  connector Conn
+    Real x;
+    Real y;
+  end Conn;
+
+  model Test
+    input Conn c1;
+    output Conn c2;
+    input Real x1;
+    output Real x2;
+  equation
+    connect(c1, c2); // OK
+    connect(x1, x2); // error, x1 and x2 are not (both) connectors
+    // x1 = x2; // OK
+  end Test;
+end Example;
+]]>
+        </example>
     </rule>
 
     <rule name="AmbiguousResolution"
           language="modelica"
           message="Type resolution is ambiguous: {0}"
+          externalInfoUrl="${pmd.website.baseurl}/pmd_rules_modelica_bestpractices.html#ambiguousresolution"
           class="net.sourceforge.pmd.lang.modelica.rule.AmbiguousResolutionRule">
         <description>
             There is multiple candidates for this type resolution. While generally this is not an error,
             this may indicate a bug.
         </description>
         <priority>3</priority>
+        <example>
+<![CDATA[
+package Test
+  package Inc1
+    model X
+    end X;
+    model Y
+    end Y;
+  end Inc1;
+  package Inc2
+    model Y
+    end Y;
+    model Z
+    end Z;
+  end Inc2;
+  model B
+    import Test.Inc1.*;
+    import Test.Inc2.*;
+    Y y; // Class Y is imported twice
+  end B;
+end Test;
+]]>
+        </example>
     </rule>
 </ruleset>
\ No newline at end of file
diff --git a/pmd-modelica/src/test/resources/net/sourceforge/pmd/lang/modelica/rule/bestpractices/xml/AmbiguousResolution.xml b/pmd-modelica/src/test/resources/net/sourceforge/pmd/lang/modelica/rule/bestpractices/xml/AmbiguousResolution.xml
index 1e758660c9..fd017e05a7 100644
--- a/pmd-modelica/src/test/resources/net/sourceforge/pmd/lang/modelica/rule/bestpractices/xml/AmbiguousResolution.xml
+++ b/pmd-modelica/src/test/resources/net/sourceforge/pmd/lang/modelica/rule/bestpractices/xml/AmbiguousResolution.xml
@@ -40,7 +40,7 @@ end Test;
         ]]></code>
     </test-code>
     <test-code>
-        <description>Invalid example: class Y is both placed to the scope by extending and import</description>
+        <description>Invalid example: class Y is imported twice</description>
         <expected-problems>1</expected-problems>
         <code><![CDATA[
 package Test
@@ -64,8 +64,7 @@ package Test
 end Test;
         ]]></code>
     </test-code>
-<!--
-    <test-code>
+    <test-code regressionTest="false">
         <description>Invalid example: suspicious reference to X</description>
         <expected-problems>1</expected-problems>
         <code><![CDATA[
@@ -78,5 +77,4 @@ package Test
 end Test;
         ]]></code>
     </test-code>
--->
 </test-data>