diff --git a/config.xml b/config.xml
index 01a5dd32f13e102a80ec96d963b209f5e5f1d49f..569461cb5c57b1c6f5edccd141f978f1cda5df9a 100644
--- a/config.xml
+++ b/config.xml
@@ -3,7 +3,7 @@
         "-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
         "https://checkstyle.org/dtds/configuration_1_3.dtd">
 
-<module name = "Checker">
+<module name="Checker">
     <property name="charset" value="UTF-8"/>
     <property name="localeLanguage" value="de"/>
 
@@ -11,37 +11,45 @@
 
     <property name="fileExtensions" value="java, properties, xml"/>
 
+    <module name="SuppressWithPlainTextCommentFilter">
+        <property name="offCommentFormat" value="STOP CHECKSTYLE"/>
+        <property name="onCommentFormat" value="START CHECKSTYLE"/>
+    </module>
+
     <module name="LineLength">
         <property name="fileExtensions" value="java"/>
         <property name="max" value="100"/>
+        <property name="severity" value="info"/>
         <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
     </module>
 
     <module name="RegexpMultiline">
         <property name="format" value="\*\/\s*(\n\s*){2,}"/>
         <property name="matchAcrossLines" value="true"/>
-        <property name="maximum" value="0" />
+        <property name="maximum" value="0"/>
+        <property name="severity" value="info"/>
         <message key="regexp.exceeded"
-                 value="Zwischen Javadoc und nächster Codezeile sollten keine Leerzeilen stehen." />
+                 value="Zwischen Javadoc und nächster Codezeile sollten keine Leerzeilen stehen."/>
     </module>
     <module name="RegexpMultiline">
         <property name="format" value="(\n\s*){4,}"/>
         <property name="matchAcrossLines" value="true"/>
-        <property name="maximum" value="0" />
+        <property name="maximum" value="0"/>
+        <property name="severity" value="info"/>
         <message key="regexp.exceeded"
-                 value="Es sollten nicht mehr als zwei aufeinanderfolgende Leerzeilen im Code stehen." />
+                 value="Es sollten nicht mehr als zwei aufeinanderfolgende Leerzeilen im Code stehen."/>
     </module>
     <module name="RegexpSingleline">
         <property name="format" value="\/\*\*.+\*\/"/>
-        <property name="maximum" value="0" />
+        <property name="maximum" value="0"/>
         <message key="regexp.exceeded"
-                 value="Javadoc-Kommentare sollten nicht auf nur einer Zeile stehen." />
+                 value="Javadoc-Kommentare sollten nicht auf nur einer Zeile stehen."/>
     </module>
     <module name="RegexpSingleline">
         <property name="format" value="\*.+\*\/"/>
-        <property name="maximum" value="0" />
+        <property name="maximum" value="0"/>
         <message key="regexp.exceeded"
-                 value="Javadoc-Kommentare sollten in einer separaten Zeile nur mit '*/' enden." />
+                 value="Javadoc-Kommentare sollten in einer separaten Zeile nur mit '*/' enden."/>
     </module>
 
     <module name="TreeWalker">
@@ -62,6 +70,7 @@
                     LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
                     LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, METHOD_DEF,
                     OBJBLOCK, STATIC_INIT, RECORD_DEF, COMPACT_CTOR_DEF"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="RightCurly">
             <property name="id" value="RightCurlyAlone"/>
@@ -76,6 +85,7 @@
             <property name="tokens"
                       value="COMMA, SEMI, TYPECAST, LITERAL_IF, LITERAL_ELSE,
                     LITERAL_WHILE, LITERAL_DO, LITERAL_FOR, DO_WHILE"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="WhitespaceAround">
             <property name="allowEmptyConstructors" value="true"/>
@@ -96,48 +106,63 @@
                      value="Hinter ''{0}'' steht kein Leerzeichen."/>
             <message key="ws.notPreceded"
                      value="Vor ''{0}'' muss ein Leerzeichen stehen."/>
+            <property name="severity" value="info"/>
         </module>
         <module name="OneStatementPerLine"/>
         <module name="MultipleVariableDeclarations"/>
-        <module name="ArrayTypeStyle"/>
+        <module name="ArrayTypeStyle">
+            <property name="severity" value="info"/>
+        </module>
         <module name="MissingSwitchDefault"/>
         <module name="MissingCtor"/>
-        <module name="FallThrough"/>
-        <module name="UpperEll"/>
-        <module name="ModifierOrder"/>
+        <module name="FallThrough">
+            <property name="severity" value="info"/>
+        </module>
+        <module name="UpperEll">
+            <property name="severity" value="info"/>
+        </module>
+        <module name="ModifierOrder">
+            <property name="severity" value="info"/>
+        </module>
         <module name="EmptyLineSeparator">
             <property name="tokens"
                       value="PACKAGE_DEF, IMPORT, STATIC_IMPORT, CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
                     STATIC_INIT, INSTANCE_INIT, METHOD_DEF, CTOR_DEF, VARIABLE_DEF, RECORD_DEF,
                     COMPACT_CTOR_DEF"/>
+            <property name="severity" value="info"/>
             <property name="allowNoEmptyLineBetweenFields" value="true"/>
         </module>
         <module name="SeparatorWrap">
             <property name="id" value="SeparatorWrapDot"/>
             <property name="tokens" value="DOT"/>
             <property name="option" value="nl"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="SeparatorWrap">
             <property name="id" value="SeparatorWrapComma"/>
             <property name="tokens" value="COMMA"/>
             <property name="option" value="EOL"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="SeparatorWrap">
             <!-- ELLIPSIS is EOL until https://github.com/google/styleguide/issues/259 -->
             <property name="id" value="SeparatorWrapEllipsis"/>
             <property name="tokens" value="ELLIPSIS"/>
             <property name="option" value="EOL"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="SeparatorWrap">
             <!-- ARRAY_DECLARATOR is EOL until https://github.com/google/styleguide/issues/258 -->
             <property name="id" value="SeparatorWrapArrayDeclarator"/>
             <property name="tokens" value="ARRAY_DECLARATOR"/>
             <property name="option" value="EOL"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="SeparatorWrap">
             <property name="id" value="SeparatorWrapMethodRef"/>
             <property name="tokens" value="METHOD_REF"/>
             <property name="option" value="nl"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="TypeName">
             <property name="tokens" value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF,
@@ -208,8 +233,10 @@
         </module>
         -->
         <module name="NoFinalizer"/>
-        <module name="GenericWhitespace" />
-        <module name="HiddenField" />
+        <module name="GenericWhitespace">
+            <property name="severity" value="info"/>
+        </module>
+        <module name="HiddenField"/>
         <module name="Indentation">
             <property name="basicOffset" value="4"/>
             <property name="braceAdjustment" value="0"/>
@@ -217,18 +244,23 @@
             <property name="throwsIndent" value="4"/>
             <property name="lineWrappingIndentation" value="4"/>
             <property name="arrayInitIndent" value="4"/>
+            <property name="severity" value="info"/>
+        </module>
+        <module name="NoWhitespaceBeforeCaseDefaultColon">
+            <property name="severity" value="info"/>
         </module>
-        <module name="NoWhitespaceBeforeCaseDefaultColon"/>
         <module name="MethodParamPad">
             <property name="tokens"
                       value="CTOR_DEF, LITERAL_NEW, METHOD_CALL, METHOD_DEF,
                     SUPER_CTOR_CALL, ENUM_CONSTANT_DEF, RECORD_DEF"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="NoWhitespaceBefore">
             <property name="tokens"
                       value="COMMA, SEMI, POST_INC, POST_DEC, DOT,
                     LABELED_STAT, METHOD_REF"/>
             <property name="allowLineBreaks" value="true"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="ParenPad">
             <property name="tokens"
@@ -237,6 +269,7 @@
                     LITERAL_SWITCH, LITERAL_SYNCHRONIZED, LITERAL_WHILE, METHOD_CALL,
                     METHOD_DEF, QUESTION, RESOURCE_SPECIFICATION, SUPER_CTOR_CALL, LAMBDA,
                     RECORD_DEF"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="OperatorWrap">
             <property name="option" value="NL"/>
@@ -244,17 +277,20 @@
                       value="BAND, BOR, BSR, BXOR, DIV, EQUAL, GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR,
                     LT, MINUS, MOD, NOT_EQUAL, PLUS, QUESTION, SL, SR, STAR, METHOD_REF,
                     TYPE_EXTENSION_AND "/>
+            <property name="severity" value="info"/>
         </module>
         <module name="AnnotationLocation">
             <property name="id" value="AnnotationLocationMostCases"/>
             <property name="tokens"
                       value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF,
                       RECORD_DEF, COMPACT_CTOR_DEF"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="AnnotationLocation">
             <property name="id" value="AnnotationLocationVariables"/>
             <property name="tokens" value="VARIABLE_DEF"/>
             <property name="allowSamelineMultipleAnnotations" value="true"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="NonEmptyAtclauseDescription"/>
         <module name="InvalidJavadocPosition"/>
@@ -264,16 +300,18 @@
             <property name="tagOrder" value="@param, @return, @throws, @deprecated"/>
             <property name="target"
                       value="CLASS_DEF, INTERFACE_DEF, ENUM_DEF, METHOD_DEF, CTOR_DEF, VARIABLE_DEF"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="JavadocMethod">
             <property name="accessModifiers" value="package, public"/>
             <property name="allowedAnnotations" value="Override, Test"/>
-            <property name="allowMissingParamTags" value="false" />
-            <property name="allowMissingReturnTag" value="false" />
+            <property name="allowMissingParamTags" value="false"/>
+            <property name="allowMissingReturnTag" value="false"/>
             <property name="tokens" value="METHOD_DEF, CTOR_DEF, ANNOTATION_FIELD_DEF, COMPACT_CTOR_DEF"/>
         </module>
         <module name="JavadocContentLocationCheck">
-            <property name="location" value="second_line" />
+            <property name="location" value="second_line"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="MissingJavadocMethod">
             <property name="scope" value="package"/>
@@ -282,10 +320,10 @@
                                    COMPACT_CTOR_DEF"/>
         </module>
         <module name="JavadocType">
-            <property name="authorFormat" value="^.+$" />
-            <property name="versionFormat" value="^.+$" />
-            <property name="allowUnknownTags" value="false" />
-            <message key="type.tagFormat" value="Der @version oder @author Tag fehlen im Javadoc-Kommentar." />
+            <property name="authorFormat" value="^.+$"/>
+            <property name="versionFormat" value="^.+$"/>
+            <property name="allowUnknownTags" value="false"/>
+            <message key="type.tagFormat" value="Der @version oder @author Tag fehlen im Javadoc-Kommentar."/>
         </module>
         <module name="MissingJavadocType">
             <property name="scope" value="package"/>
@@ -294,11 +332,11 @@
                       RECORD_DEF, ANNOTATION_DEF"/>
         </module>
         <module name="JavadocStyle">
-            <property name="checkEmptyJavadoc" value="true" />
+            <property name="checkEmptyJavadoc" value="true"/>
         </module>
         <module name="VisibilityModifier">
             <property name="packageAllowed" value="false"/>
-            <property name="protectedAllowed" value="false"/>
+            <property name="allowPublicFinalFields" value="true"/>
         </module>
         <module name="MethodName">
             <property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9_]*$"/>
@@ -307,18 +345,27 @@
         </module>
         <module name="SingleLineJavadoc">
             <property name="ignoreInlineTags" value="false"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="EmptyCatchBlock">
             <property name="exceptionVariableName" value="expected"/>
         </module>
         <module name="CommentsIndentation">
             <property name="tokens" value="SINGLE_LINE_COMMENT, BLOCK_COMMENT_BEGIN"/>
+            <property name="severity" value="info"/>
         </module>
         <module name="SimplifyBooleanExpression"/>
         <module name="SimplifyBooleanReturn"/>
-        <module name="StringLiteralEquality"/>
-        <module name="ExplicitInitialization"/>
-        <module name="EmptyStatement"/>
+        <module name="StringLiteralEquality">
+            <property name="severity" value="info"/>
+        </module>
+        <module name="ExplicitInitialization">
+            <property name="onlyObjectReferences" value="true"/>
+            <property name="severity" value="info"/>
+        </module>
+        <module name="EmptyStatement">
+            <property name="severity" value="info"/>
+        </module>
 
         <module name="SuppressionCommentFilter">
             <property name="offCommentFormat" value="STOP CHECKSTYLE"/>