diff --git a/homepage/cwsvJudo/phpstan.neon b/homepage/cwsvJudo/phpstan.neon
index ef1f115..483bd3a 100644
--- a/homepage/cwsvJudo/phpstan.neon
+++ b/homepage/cwsvJudo/phpstan.neon
@@ -1,9 +1,10 @@
 parameters:
-	level: 0
+	level: 1
 	paths:
 		- build/dist/heliohost/httpdocs/participo
 	scanDirectories:
 		- build/dist/heliohost/libs
+		- build/dist/heliohost/httpdocs/ressourcen/phpLib
 	bootstrapFiles:
 		- phpstan.bootstrap.php
 	ignoreErrors:
diff --git a/homepage/participo/addEvent.php b/homepage/participo/addEvent.php
index 4d19bf6..9e1b4b8 100644
--- a/homepage/participo/addEvent.php
+++ b/homepage/participo/addEvent.php
@@ -1,6 +1,10 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
+
 require_once "participoLib/participo.php";
+
 participo::init($CONFIG["cwsvJudo"], $SECRETS["cwsvJudo"]);
 
 $message = [];
diff --git a/homepage/participo/admin.inc.php b/homepage/participo/admin.inc.php
index f7df735..2cae1d5 100644
--- a/homepage/participo/admin.inc.php
+++ b/homepage/participo/admin.inc.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 // libraries
@@ -16,4 +18,3 @@ $meta = [
     "title" => "AdminStuff",
     "description" => "Administrative Verwaltung",
 ];
-?>
diff --git a/homepage/participo/admin.php b/homepage/participo/admin.php
index f53c191..211c367 100644
--- a/homepage/participo/admin.php
+++ b/homepage/participo/admin.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $meta pages meta information (provided via bootstraping) */
+// @todo Better architecture. This forward declaration shouldn't be necessary.
 require "admin.inc.php"; ?>
 <!DOCTYPE html>
 <html>
diff --git a/homepage/participo/admin.sidenav.inc.php b/homepage/participo/admin.sidenav.inc.php
index 288ae68..26a59d1 100644
--- a/homepage/participo/admin.sidenav.inc.php
+++ b/homepage/participo/admin.sidenav.inc.php
@@ -1,3 +1,7 @@
+<?php
+/** @var array $meta pages meta information (needs to be defined in the including php file) */
+// @todo Better architecture. This forward declaration shouldn't be necessary.
+?>
 <!-- cwsvJudoApps-Admin sidenav-->
 <div>
     <nav class="indigo darken-4">
diff --git a/homepage/participo/api.apiKeys.add.php b/homepage/participo/api.apiKeys.add.php
index 93e7bc6..fbe796a 100644
--- a/homepage/participo/api.apiKeys.add.php
+++ b/homepage/participo/api.apiKeys.add.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 require_once "participoLib/participo.php";
diff --git a/homepage/participo/api.starter.add.php b/homepage/participo/api.starter.add.php
index 6082698..5e700a8 100644
--- a/homepage/participo/api.starter.add.php
+++ b/homepage/participo/api.starter.add.php
@@ -1,8 +1,12 @@
 <?php
-// (local specific) settings
-require_once "config.php";
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
+// (local specific) settings
+// @todo remove ore move to bootstrapping
+require_once "config.php";
+
 require_once "participoLib/dbConnector.php";
 require_once "participoLib/participo.php";
 require_once "participoLib/planer.php";
diff --git a/homepage/participo/api.starter.remove.php b/homepage/participo/api.starter.remove.php
index fd4da6f..c7a9f34 100644
--- a/homepage/participo/api.starter.remove.php
+++ b/homepage/participo/api.starter.remove.php
@@ -1,6 +1,6 @@
 <?php
-// (local specific) settings
-require_once "config.php";
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 require_once "participoLib/dbConnector.php";
diff --git a/homepage/participo/api.user.add.php b/homepage/participo/api.user.add.php
index d599f66..e7b09ac 100644
--- a/homepage/participo/api.user.add.php
+++ b/homepage/participo/api.user.add.php
@@ -1,6 +1,6 @@
 <?php
-// (local specific) settings
-require_once "config.php";
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 require_once "participoLib/dbConnector.php";
diff --git a/homepage/participo/api/inc/bootstrap.php b/homepage/participo/api/inc/bootstrap.php
index dcf59a1..e997f8b 100644
--- a/homepage/participo/api/inc/bootstrap.php
+++ b/homepage/participo/api/inc/bootstrap.php
@@ -1,5 +1,13 @@
 <?php
 /// @file common settings and includes for the participo api
+
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
+require_once "bootstrap.php";
+
+require_once "participoLib/event.php";
+participo::init($CONFIG["cwsvJudo"], $SECRETS["cwsvJudo"]);
+
 /// - set locale to german
 setlocale(LC_ALL, "de_DE@euro", "de_DE", "de", "ge");
 /// - extend the include search path for
@@ -23,6 +31,7 @@ require_once "participoLib/dbConnector.php";
 
 function authorize()
 {
+    $allowKey = null;
     if (array_key_exists("HTTP_AUTHORIZATION", $_SERVER)) {
         if (!empty($_SERVER["HTTP_AUTHORIZATION"])) {
             $auth = explode(" ", $_SERVER["HTTP_AUTHORIZATION"]);
@@ -41,15 +50,3 @@ function authorize()
         );
     }
 }
-
-/// - initialize the database connection
-dbConnector::setOptions([
-    "dbCharset" => $cwsvJudoConfig["dbCharset"] ?? "UTF-8",
-    "outCharset" => $cwsvJudoConfig["outCharset"] ?? "UTF-8",
-]);
-dbConnector::connect(
-    $cwsvJudoConfig["db"]["host"],
-    $cwsvJudoConfig["db"]["name"],
-    $cwsvJudoConfig["db"]["user"],
-    $cwsvJudoConfig["db"]["password"],
-);
diff --git a/homepage/participo/api/users.php b/homepage/participo/api/users.php
index 7594490..71256e2 100644
--- a/homepage/participo/api/users.php
+++ b/homepage/participo/api/users.php
@@ -1,5 +1,8 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
+
 require_once "participoLib/participo.php";
 
 function init($config, $secrets)
@@ -18,6 +21,7 @@ function init($config, $secrets)
 
 function authorize()
 {
+    $allowKey = null;
     if (array_key_exists("HTTP_AUTHORIZATION", $_SERVER)) {
         if (!empty($_SERVER["HTTP_AUTHORIZATION"])) {
             $auth = explode(" ", $_SERVER["HTTP_AUTHORIZATION"]);
diff --git a/homepage/participo/apiKeyTest.php b/homepage/participo/apiKeyTest.php
index c0b4e3b..1d030e5 100644
--- a/homepage/participo/apiKeyTest.php
+++ b/homepage/participo/apiKeyTest.php
@@ -1,4 +1,8 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
+require_once "bootstrap.php";
+
 require_once "config/participo.php";
 
 require_once "./local/cwsvJudo.php";
@@ -8,16 +12,7 @@ require_once "participoLib/apiKey.php";
 
 require_once "spyc/Spyc.php";
 
-dbConnector::setOptions([
-    "dbCharset" => $cwsvJudoConfig["dbCharset"] ?? "UTF-8",
-    "outCharset" => $cwsvJudoConfig["outCharset"] ?? "UTF-8",
-]);
-dbConnector::connect(
-    $cwsvJudoConfig["db"]["host"],
-    $cwsvJudoConfig["db"]["name"],
-    $cwsvJudoConfig["db"]["user"],
-    $cwsvJudoConfig["db"]["password"],
-);
+participo::init($CONFIG["cwsvJudo"], $SECRETS["cwsvJudo"]);
 
 $userId = 1;
 $apiKey = ApiKey::create();
diff --git a/homepage/participo/attendance.php b/homepage/participo/attendance.php
index a9d6f9e..0cb6df1 100644
--- a/homepage/participo/attendance.php
+++ b/homepage/participo/attendance.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 require_once "./lib/api.php";
@@ -259,6 +261,8 @@ class Attendance
 
 // show own ...
 
+// show own ...
+
 $ownAttendances = Attendance::getUsersAttendance($_SESSION["user"]["userId"]);
 if (!empty($ownAttendances)) {
     echo '<h2 id="attendance-' .
diff --git a/homepage/participo/attributer.php b/homepage/participo/attributer.php
index 93a1a03..c59289f 100644
--- a/homepage/participo/attributer.php
+++ b/homepage/participo/attributer.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 // libraries
@@ -143,7 +145,7 @@ function withdrawUsersAttribute($anUserId, $anAttributeId, $limit = null)
         print "Error!: " .
             $db_error->getMessage() .
             "<br/>queryString: " .
-            $queryString .
+            ($queryString ?? "<invalid>") .
             "<br />";
         var_dump($bindArray);
     }
diff --git a/homepage/participo/bootstrap.php b/homepage/participo/bootstrap.php
index 1d765e6..3b300af 100644
--- a/homepage/participo/bootstrap.php
+++ b/homepage/participo/bootstrap.php
@@ -1,4 +1,5 @@
 <?php
+/** @var ?array $HOME the home directory on the server (defined via bootstraping) */
 require_once "config.php";
 
 if (!isset($HOME)) {
diff --git a/homepage/participo/event.php b/homepage/participo/event.php
index 72c515f..c32d781 100644
--- a/homepage/participo/event.php
+++ b/homepage/participo/event.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 require_once "participoLib/event.php";
diff --git a/homepage/participo/events.inc.php b/homepage/participo/events.inc.php
index b6b6b8a..1ff9a0b 100644
--- a/homepage/participo/events.inc.php
+++ b/homepage/participo/events.inc.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 require_once "participoLib/participo.php";
diff --git a/homepage/participo/events.php b/homepage/participo/events.php
index c13399d..d7f7620 100644
--- a/homepage/participo/events.php
+++ b/homepage/participo/events.php
@@ -1,4 +1,7 @@
-<?php require_once "events.inc.php"; ?>
+<?php
+/** @var array $meta pages meta information (provided via bootstraping) */
+// @todo Better architecture. This forward declaration shouldn't be necessary.
+require_once "events.inc.php"; ?>
 <!DOCTYPE html>
 <html>
 
diff --git a/homepage/participo/events.sidenav.inc.php b/homepage/participo/events.sidenav.inc.php
index 32d1d9b..e8d4e6f 100644
--- a/homepage/participo/events.sidenav.inc.php
+++ b/homepage/participo/events.sidenav.inc.php
@@ -1,3 +1,7 @@
+<?php
+/** @var array $meta pages meta information (needs to be defined in the including php file) */
+// @todo Better architecture. This forward declaration shouldn't be necessary.
+?>
 <!-- cwsvJudoApps SideNav -->
 <div>
 	<nav class="indigo darken-4">
diff --git a/homepage/participo/index.inc.php b/homepage/participo/index.inc.php
index 589d421..82448a8 100644
--- a/homepage/participo/index.inc.php
+++ b/homepage/participo/index.inc.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 // legacy lib usage
diff --git a/homepage/participo/infoZettel.php b/homepage/participo/infoZettel.php
index 4fac163..7a2eaa1 100644
--- a/homepage/participo/infoZettel.php
+++ b/homepage/participo/infoZettel.php
@@ -1,4 +1,8 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
+/** @var array $HOME the home directory on the server (defined via bootstraping) */
+// @todo $HOME should only be used once in the bootstraping, not in every endpoint again.
 require_once "bootstrap.php";
 
 require_once "participoLib/participo.php";
@@ -12,7 +16,7 @@ require_once "spyc/Spyc.php";
 participo::authentificate();
 
 // get a list of all infoZettel
-$fileList = glob(join("/", [$BASE_PATH, "infoZettel", "*.md"]));
+$fileList = glob(join("/", [$HOME, "infoZettel", "*.md"]));
 rsort($fileList);
 $years = [];
 foreach ($fileList as $file) {
@@ -74,30 +78,12 @@ $years = array_unique($years);
 		<main>
 			<!-- List of Infos -->
 			<div class="row" id="infoList">
-<?php
-if (sizeof($fileList) > 0) {
+<?php if (sizeof($fileList) > 0) {
     $currentYear = (int) substr(basename($fileList[0]), 0, 4);
     echo '<h2 id="infoZettel-' . $currentYear . '">' . $currentYear . "</h2>";
-} else {
-    echo "<h2>Seltsam! Keine Infozettel gefunden...</h2>";
-}
-foreach ($fileList as $file) {
-
-    $thisYear = (int) substr(basename($file), 0, 4);
-    if ($thisYear != $currentYear) {
-        $currentYear = $thisYear;
-        echo '<h2 id="infoZettel-' .
-            $currentYear .
-            '">' .
-            $currentYear .
-            "</h2>";
-    }
-
-    // get a list of all infoZettel
-    $fileList = glob($basePath . "/infoZettel/*.md");
-    rsort($fileList);
 
     foreach ($fileList as $file) {
+
         $thisYear = (int) substr(basename($file), 0, 4);
         if ($thisYear != $currentYear) {
             $currentYear = $thisYear;
@@ -108,17 +94,36 @@ foreach ($fileList as $file) {
                 "</h2>";
         }
 
-        $infoZettel = loadMarkdownFile($file);
-        echo AppCard::fromArray([
-            "title" => $infoZettel["yaml"]["title"],
-            "description" => Parsedown::instance()->text($infoZettel["mdText"]),
-        ])->htmlCode(["extraClass" => "parsedownCard"]);
-    }
-    ?>
+        // get a list of all infoZettel
+        $fileList = glob($HOME . "/infoZettel/*.md");
+        rsort($fileList);
+
+        foreach ($fileList as $file) {
+            $thisYear = (int) substr(basename($file), 0, 4);
+            if ($thisYear != $currentYear) {
+                $currentYear = $thisYear;
+                echo '<h2 id="infoZettel-' .
+                    $currentYear .
+                    '">' .
+                    $currentYear .
+                    "</h2>";
+            }
+
+            $infoZettel = loadMarkdownFile($file);
+            echo AppCard::fromArray([
+                "title" => $infoZettel["yaml"]["title"],
+                "description" => Parsedown::instance()->text(
+                    $infoZettel["mdText"],
+                ),
+            ])->htmlCode(["extraClass" => "parsedownCard"]);
+        }
+        ?>
 			</div><!-- End of Infos -->
 		</main>
 <?php
-}
-?>
+    }
+} else {
+    echo "<h2>Seltsam! Keine Infozettel gefunden...</h2>";
+} ?>
 	</body>
 </html>
diff --git a/homepage/participo/kyu.php b/homepage/participo/kyu.php
index 1caa713..919de67 100644
--- a/homepage/participo/kyu.php
+++ b/homepage/participo/kyu.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 require_once "participoLib/participo.php";
diff --git a/homepage/participo/lib/api.php b/homepage/participo/lib/api.php
index e4239dc..a48ccd2 100644
--- a/homepage/participo/lib/api.php
+++ b/homepage/participo/lib/api.php
@@ -75,11 +75,8 @@ function array_keys_exist(array $array, $keys)
 function updateUserPassword($db, $userId, $password)
 {
     // we don't save the actual password but it's hash
-    if ($password != "") {
-        $password = password_hash($password, PASSWORD_DEFAULT);
-    } else {
-        $password = null;
-    }
+    $password =
+        $password != "" ? password_hash($password, PASSWORD_DEFAULT) : null;
 
     $query =
         "UPDATE `cwsvjudo_main`.`wkParticipo_Users` SET `pwHash`=:val WHERE `id`=:id;";
@@ -114,7 +111,7 @@ function changePassword(
         return false;
     }
 
-    $changerInfo = getUserData($db, $changerId);
+    $changerInfo = getUserData($changerId);
 
     // check the password of the changer
     if (!password_verify($changerPassword, $changerInfo["pwHash"])) {
diff --git a/homepage/participo/lib/participoLib/apiKey.php b/homepage/participo/lib/participoLib/apiKey.php
index 24da457..429529a 100644
--- a/homepage/participo/lib/participoLib/apiKey.php
+++ b/homepage/participo/lib/participoLib/apiKey.php
@@ -96,7 +96,7 @@ class ApiKey
      * @param string $key the key to request
      * @return ApiKey found in the db, null otherwise
      */
-    public static function loadFromDb(string $key)
+    public static function loadFromDb(string $key): ?ApiKey
     {
         if (!self::isWellFormatted($key)) {
             return null;
diff --git a/homepage/participo/lib/participoLib/attendance.php b/homepage/participo/lib/participoLib/attendance.php
index b9269eb..303a07a 100644
--- a/homepage/participo/lib/participoLib/attendance.php
+++ b/homepage/participo/lib/participoLib/attendance.php
@@ -34,7 +34,6 @@ function processPostData($db, $post, $redirectLocation = "."): void
                 isValid($post["corona_eMail"], "email")
             ) {
                 addCoronaUser(
-                    $db,
                     $post["name"],
                     $post["vorname"],
                     $post["corona_PLZ"],
diff --git a/homepage/participo/lib/participoLib/event.php b/homepage/participo/lib/participoLib/event.php
index 0b9b64d..f903cee 100644
--- a/homepage/participo/lib/participoLib/event.php
+++ b/homepage/participo/lib/participoLib/event.php
@@ -10,7 +10,7 @@ class Event
     // members in the db
     private $id = null; //< unique id of the event in the db
     private $date = null; //< date for the event (@todo ranges?)
-    private $shiaiId = null; //< unique id of the shiai in the db (if appropriate)
+    private ?int $shiaiId = null; //< unique id of the shiai in the db (if appropriate)
     private $deadline = null; //< until when one can register for the event
     private $remarks = null; //< remarks to the event (special rules) or a json object for missing data (e.g. non-shiai events)
 
@@ -59,7 +59,7 @@ class Event
      *
      * @return int>0 id for the shiai in the db
      */
-    public function getShiaiId()
+    public function getShiaiId(): ?int
     {
         return $this->shiaiId;
     }
diff --git a/homepage/participo/lib/participoLib/participo.php b/homepage/participo/lib/participoLib/participo.php
index 23fdc13..72ac5eb 100644
--- a/homepage/participo/lib/participoLib/participo.php
+++ b/homepage/participo/lib/participoLib/participo.php
@@ -137,7 +137,7 @@ class participo
         if (array_key_exists("apiKey", $_GET)) {
             self::logout();
             $key = ApiKey::loadFromDb($_GET["apiKey"]);
-            if (isset($key) && $key->isValidFor($action)) {
+            if ($key !== null && $key->isValidFor($action)) {
                 $user = User::loadFromDb($key->getUserId());
                 // case valid login: Set the session data
                 $_SESSION = [
@@ -178,7 +178,7 @@ class participo
      * @param array $secrets secret values (e.g. passwords)
      * @return void
      */
-    public static function init(array $config, array $secrets)
+    public static function init(array $config, array $secrets): void
     {
         self::initDb(
             $config["db"]["host"],
diff --git a/homepage/participo/lib/participoLib/ride.php b/homepage/participo/lib/participoLib/ride.php
index 8a9ddcd..1f8336d 100644
--- a/homepage/participo/lib/participoLib/ride.php
+++ b/homepage/participo/lib/participoLib/ride.php
@@ -6,14 +6,21 @@ require_once "participoLib/participo.php";
  */
 class PdoCellValue
 {
+    /**
+     * @param mixed $value
+     * @param mixed $type
+     */
     public function __construct(string $name, $value, $type)
     {
         $this->name = $name;
         $this->value = $value;
         $this->type = $type;
     }
-
-    public static function collect(array $row)
+    /**
+     * @param array<int,mixed> $row
+     * @return array
+     */
+    public static function collect(array $row): array
     {
         $names = [];
         foreach ($row as $entry) {
@@ -28,8 +35,11 @@ class PdoCellValue
     {
         return $this->value;
     }
-
-    public function setValue($value)
+    /**
+     * @param mixed $value
+     * @return void
+     */
+    public function setValue($value): void
     {
         $this->value = $value;
     }
@@ -78,18 +88,21 @@ class Ride
         );
         $this->passengerIds = new PdoCellValue(
             "mitfahrer",
-            self::filterCsv($passengerIds, filterId),
+            self::filterCsv($passengerIds, "filterId"),
             PDO::PARAM_STR,
         );
     }
 
-    /** parse and sanitize a csvFormatted string */
+    /** parse and sanitize a csvFormatted string
+     * @param callable(): mixed $callback
+     * @return string[]|bool
+     */
     public function filterCsv(
         string $list,
-        $callback,
+        callable $callback,
         string $separator = ",",
         bool $dontTrim = false,
-    ) {
+    ): array|false {
         $list = explode($separator, $list);
         foreach ($list as &$element) {
             $element = $callback($element);
@@ -129,9 +142,13 @@ class Ride
         }
         return $sliced;
     }
-
-    private static function dbSelect() {}
-
+    /**
+     * @return void
+     */
+    private static function dbSelect(): void {}
+    /**
+     * @param array<int,mixed> $values
+     */
     private static function dbInsert(array $values)
     {
         $names = [];
@@ -162,10 +179,14 @@ class Ride
         ]);
         return dbConnector::getLastInsertId();
     }
-
-    private static function dbDelete() {}
-
-    private static function dbUpdate() {}
+    /**
+     * @return void
+     */
+    private static function dbDelete(): void {}
+    /**
+     * @return void
+     */
+    private static function dbUpdate(): void {}
 
     ////
     // private variables
diff --git a/homepage/participo/lib/participoLib/starter.php b/homepage/participo/lib/participoLib/starter.php
index ee346a5..035eb44 100644
--- a/homepage/participo/lib/participoLib/starter.php
+++ b/homepage/participo/lib/participoLib/starter.php
@@ -72,7 +72,7 @@ class Starter
         if (is_iterable($result)) {
             $this->result = [];
             foreach ($result as $r) {
-                $r = filter_var($r, FILTER_VAR_INT, [
+                $r = filter_var($r, FILTER_VALIDATE_INT, [
                     "options" => ["default" => null, "min_range" => 0],
                 ]);
                 if ($r) {
@@ -142,9 +142,9 @@ class Starter
      * @todo an admin should also be allowed
      * @todo the deadline of the event should be checked as well
      *
-     * @return int id under which the
+     * @return ?int id of the added start, null if not added
      */
-    public function addToDb()
+    public function addToDb(): ?int
     {
         // - if the id is already set it *has* to be already in the DB hence we don't add it
         // - the logged in user must have wardship over the starter
@@ -464,7 +464,11 @@ class Starter
 
             $startingUser = User::loadFromDb($start->getUserId());
             $event = Event::loadFromDb($start->getEventId());
-            $shiai = Shiai::loadFromDb($event->getShiaiId());
+            $shiaiId = $event->getShiaiId();
+            $shiai =
+                $event->getShiaiId() !== null
+                    ? Shiai::loadFromDb($event->getShiaiId())
+                    : null;
 
             $eventDeadline = $event->getDeadline();
             $eventDate = $event->getDate();
@@ -497,11 +501,11 @@ class Starter
     private static function getHtmlModalToLate($startId, $caption = "Austragen")
     {
         $modal =
-            '<a class="btn grey waves-effect waves-light modal-trigger" href="#modal-remove-starter-' .
+            '<button class="btn grey waves-effect waves-light modal-trigger" popovertarget="modal-remove-starter-' .
             $startId .
             '">' .
             $caption .
-            "</a>" .
+            "</button>" .
             '<div id="modal-remove-starter-' .
             $startId .
             '" class="modal" popover>' .
@@ -509,7 +513,9 @@ class Starter
             "<p>Das Fenster zum  Ein- und Austragen ist bereits geschlossen.</p>" .
             "</div>" .
             '<div class="modal-footer">' .
-            '<a href="#!" class="modal-close waves-effect waves-green btn-flat">OK</a>' .
+            '<button tabindex="0" class="waves-effect waves-green btn-flat" popovertarget="modal-remove-starter-' .
+            $startId .
+            '">OK</button>' .
             "</div>" .
             "</div>";
 
diff --git a/homepage/participo/lib/participoLib/user.php b/homepage/participo/lib/participoLib/user.php
index 84f682a..a38ca08 100644
--- a/homepage/participo/lib/participoLib/user.php
+++ b/homepage/participo/lib/participoLib/user.php
@@ -522,17 +522,15 @@ function getUserData($userId)
 /// @todo Legacy function! Replace with one within the User-Framework!
 function getUsersKids($userId, $options = [])
 {
-    $options["attribute"] ??
-        ($query = <<<SQL
-        SELECT *
-        FROM `wkParticipo_Users`
-        JOIN `vormundschaft`
-          ON `wkParticipo_Users`.`id` = `vormundschaft`.`kidId`
-        WHERE `vormundschaft`.`userId` = :userId;
-        SQL);
+    $query = <<<SQL
+    SELECT *
+    FROM `wkParticipo_Users`
+    JOIN `vormundschaft`
+      ON `wkParticipo_Users`.`id` = `vormundschaft`.`kidId`
+    WHERE `vormundschaft`.`userId` = :userId;
+    SQL;
     $params = [
         ":userId" => ["value" => $userId, "data_type" => PDO::PARAM_INT],
     ];
-    $result = dbConnector::query($query, $params);
-    return $result;
+    return dbConnector::query($query, $params);
 }
diff --git a/homepage/participo/login.php b/homepage/participo/login.php
index 1226ee9..a101b98 100644
--- a/homepage/participo/login.php
+++ b/homepage/participo/login.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 require_once "participoLib/participo.php";
diff --git a/homepage/participo/mams.js b/homepage/participo/mams.js
index 6e3c154..3c32846 100644
--- a/homepage/participo/mams.js
+++ b/homepage/participo/mams.js
@@ -21,8 +21,10 @@ function initSidenav() {
 function initDatepicker() {
   options = {
     format: "yyyy-mm-dd",
+    // workaround for v2.2.2: datepicker-container not opening on click
+    // @todo remove with version
+    openByDefault: true,
   };
   var elems = document.querySelectorAll(".datepicker");
   var instances = M.Datepicker.init(elems, options);
-  console.log("datepicker initialized");
 }
diff --git a/homepage/participo/mams.php b/homepage/participo/mams.php
index da1e283..4bda4de 100644
--- a/homepage/participo/mams.php
+++ b/homepage/participo/mams.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 // libraries
diff --git a/homepage/participo/newnews.php b/homepage/participo/newnews.php
index 3f2a3ba..853c238 100644
--- a/homepage/participo/newnews.php
+++ b/homepage/participo/newnews.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 require_once "participoLib/participo.php";
diff --git a/homepage/participo/pmelo.inc.php b/homepage/participo/pmelo.inc.php
index 3e23fb3..3808055 100644
--- a/homepage/participo/pmelo.inc.php
+++ b/homepage/participo/pmelo.inc.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 // Libs
@@ -6,8 +8,6 @@ require_once "participoLib/user.php";
 
 participo::init($CONFIG["cwsvJudo"], $SECRETS["cwsvJudo"]);
 
-$pmelo = new PmElo();
-
 class PmElo
 {
     /** initialize the pmelo session */
diff --git a/homepage/participo/pmelo.php b/homepage/participo/pmelo.php
index 3b9c43a..f6d249d 100644
--- a/homepage/participo/pmelo.php
+++ b/homepage/participo/pmelo.php
@@ -1,4 +1,8 @@
-<?php require_once "pmelo.inc.php"; ?>
+<?php
+require_once "pmelo.inc.php";
+
+$pmelo = new PmElo();
+?>
 <!DOCTYPE html>
 <html>
 	<head>
diff --git a/homepage/participo/shared/sidenav.inc.php b/homepage/participo/shared/sidenav.inc.php
index 6df2b06..c59423a 100644
--- a/homepage/participo/shared/sidenav.inc.php
+++ b/homepage/participo/shared/sidenav.inc.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $meta pages meta information (needs to be defined in the including php file) */
+// @todo Better architecture. This forward declaration shouldn't be necessary.
 require_once "participoLib/participo.php"; ?>
 <!-- cwsvJudoApps SideNav -->
 <div>
diff --git a/homepage/participo/testApi.py b/homepage/participo/testApi.py
index 7ab5eb7..194f9b1 100755
--- a/homepage/participo/testApi.py
+++ b/homepage/participo/testApi.py
@@ -5,32 +5,27 @@ import json
 
 
 class TestApi:
-
     @staticmethod
     def __parse_arguments():
         import argparse
 
         argParser = argparse.ArgumentParser("testApi")
-        argParser.add_argument("method", choices=['GET', 'POST'])
+        argParser.add_argument("method", choices=["GET", "POST"])
         argParser.add_argument("--endpoint", default="shiai")
-        argParser.add_argument("--host", default="cwsvjudo.bplaced.net")
+        argParser.add_argument("--host", default="cwsvjudo.de")
         argParser.add_argument("--path", default="participo/api")
         argParser.add_argument("--key", default=None)
-        argParser.add_argument("--configFile",
-                               type=argparse.FileType('r'),
-                               default="testApi.config.yaml")
+        argParser.add_argument(
+            "--configFile", type=argparse.FileType("r"), default="testApi.config.yaml"
+        )
         _LOG_LEVEL = ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG"]
-        argParser.add_argument("--logLevel",
-                               choices=_LOG_LEVEL,
-                               default="WARNING")
-        argParser.add_argument("--input",
-                               "-i",
-                               type=argparse.FileType("r"),
-                               default=None)
-        argParser.add_argument("--output",
-                               "-o",
-                               type=argparse.FileType("w"),
-                               default="-")
+        argParser.add_argument("--logLevel", choices=_LOG_LEVEL, default="WARNING")
+        argParser.add_argument(
+            "--input", "-i", type=argparse.FileType("r"), default=None
+        )
+        argParser.add_argument(
+            "--output", "-o", type=argparse.FileType("w"), default="-"
+        )
 
         return argParser.parse_args()
 
@@ -41,12 +36,13 @@ class TestApi:
 
         with self.config.configFile as cf:
             from yaml import safe_load
+
             configData = safe_load(cf)
 
         # @todo: add the attributes from the config file to the config (if not
         # already set)
-        if not self.config.key and 'apiKey' in configData:
-            self.config.key = configData['apiKey']
+        if not self.config.key and "apiKey" in configData:
+            self.config.key = configData["apiKey"]
 
     def apiCall(self):
         return apiCall.call(
@@ -54,17 +50,20 @@ class TestApi:
             host=self.config.host,
             url="/".join([self.config.path, self.config.endpoint]),
             headers={"Authorization": f"Basic {self.config.key}"},
-            input=load_json(self.config.input) if self.config.input is not None else None)
+            input=load_json(self.config.input)
+            if self.config.input is not None
+            else None,
+        )
 
 
 def load_json(jsonFile):
     import json
+
     with jsonFile as f:
         return json.load(f)
 
 
 class apiCall:
-
     @staticmethod
     def call(
         method: str,
@@ -75,15 +74,12 @@ class apiCall:
     ) -> dict:
         import requests
 
-        if (method == "GET"):
-            r = requests.get(url=f"http://{host}/{url}",
-                             timeout=10,
-                             headers=headers)
-        elif (method == "POST"):
-            r = requests.post(json=input,
-                              url=f"http://{host}/{url}",
-                              timeout=10,
-                              headers=headers)
+        if method == "GET":
+            r = requests.get(url=f"http://{host}/{url}", timeout=10, headers=headers)
+        elif method == "POST":
+            r = requests.post(
+                json=input, url=f"http://{host}/{url}", timeout=10, headers=headers
+            )
         else:
             logging.error("This line should never been reached!")
 
diff --git a/homepage/participo/user.php b/homepage/participo/user.php
index 031b162..9ca865e 100644
--- a/homepage/participo/user.php
+++ b/homepage/participo/user.php
@@ -1,4 +1,6 @@
 <?php
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
 require_once "bootstrap.php";
 
 require_once "participoLib/participo.php";
diff --git a/homepage/participo/wk.api.php b/homepage/participo/wk.api.php
index 6dabffe..cc3bae6 100644
--- a/homepage/participo/wk.api.php
+++ b/homepage/participo/wk.api.php
@@ -1,21 +1,19 @@
 <?php
-setlocale(LC_ALL, "de_DE@euro", "de_DE", "de", "ge");
-set_include_path(get_include_path() . PATH_SEPARATOR . "./lib/");
-
-require_once "config/participo.php";
-require_once "local/cwsvJudo.php";
+/** @var array $CONFIG basic configurations (defined via bootstraping) */
+/** @var array $SECRETS passwords and other stuff worth of protection (defined via bootstraping) */
+require_once "bootstrap.php";
 
 require_once "participoLib/participo.php";
 
 dbConnector::setOptions([
-    "dbCharset" => $cwsvJudoConfig["dbCharset"] ?? "UTF-8",
-    "outCharset" => $cwsvJudoConfig["outCharset"] ?? "UTF-8",
+    "dbCharset" => $CONFIG["cwsvJudo"]["db"]["dbCharset"] ?? "UTF-8",
+    "outCharset" => $CONFIG["cwsvJudo"]["db"]["outCharset"] ?? "UTF-8",
 ]);
 $db = dbConnector::connect(
-    $cwsvJudoConfig["db"]["host"],
-    $cwsvJudoConfig["db"]["name"],
-    $cwsvJudoConfig["db"]["user"],
-    $cwsvJudoConfig["db"]["password"],
+    $CONFIG["cwsvJudo"]["db"]["host"],
+    $CONFIG["cwsvJudo"]["db"]["name"],
+    $CONFIG["cwsvJudo"]["db"]["user"],
+    $SECRETS["cwsvJudo"]["db"][$CONFIG["db"]["user"]],
 );
 
 $wkSqlQuery = "SELECT * FROM `wettkampfkalender` WHERE `Datum` >= CURDATE();";
@@ -25,4 +23,3 @@ header("Access-Control-Allow-Headers: *");
 header("Access-Control-Allow-Origin: *");
 
 echo json_encode($wkSqlResponse);
-?>
