diff --git a/plugins/proxmox/proxmox_vm_count b/plugins/proxmox/proxmox_vm_count
index bc622998..52521599 100644
--- a/plugins/proxmox/proxmox_vm_count
+++ b/plugins/proxmox/proxmox_vm_count
@@ -4,20 +4,28 @@
 : << EOF
 =head1 NAME
 
-proxmox_vm_count - Outputs the running, stopped and total counts of ProxMox VMs and LXCs.
+proxmox_vm_count
+
+=head1 NOTES
+
+Outputs the running, stopped and total counts of ProxMox VMs and LXCs.
 
 =head1 CONFIGURATION
 
-This plugin needs to run as the root user in order to have permission to run lvs and vgs
+This Plugin has to be run as root:
+
   [proxmox_vm_count]
-  [proxmox_count]
-  user root
-  group root
+    user root
+    group root
+
+=head1 MAGIC MARKERS
+
+  #%# family=auto
+  #%# capabilities=autoconf
 
 =head1 AUTHOR
 
-Michael Grote
-
+Michael Grote - git.mgrote.net
 
 =head1 LICENSE
 
@@ -25,13 +33,6 @@ GPLv3 or later
 
 SPDX-License-Identifier: GPL-3.0-or-later
 
-=head1 MAGIC MARKERS
-
- #%# family=auto
- #%# capabilities=autoconf suggest
-
-=cut
-
 EOF
 
 
diff --git a/plugins/router/mikrotik_system b/plugins/router/mikrotik_system
index 2a09032b..48f3c813 100755
--- a/plugins/router/mikrotik_system
+++ b/plugins/router/mikrotik_system
@@ -4,28 +4,33 @@
 : << EOF
 =head1 NAME
 
-mikrotik_system - This plugin fetches multiple Values from a mikrotik device.
+mikrotik_system
+
+=head1 NOTES
+
+This plugin fetches multiple values from a mikrotik device. Tested with a RB493G, RB750GR3, RB5009, CRS305 and CRS309 on Router OS >6.49.* and >7.0.4. sshpass is a dependency for this Plugin.
 
 =head1 CONFIGURATION
 
-tested with a RB493G, RB750GR3, RB5009 and CRS309.
-Dependencies:
-- sshpass
 
-A User is needed for this plugin to work:
+A User on the Target-Device is needed for this plugin to work:
 
   /user add name=munin group=read password=hallowelt address=<munin-server-ip>
 
-plugin config:
-  [mt_system_<name>]
-  user root
-  env.ssh_user munin
-  env.ssh_password hallowelt
-  env.ssh_host 192.168.2.1
+  plugin config:
+    [mt_system_<name>]
+    user root
+    env.ssh_user munin
+    env.ssh_password hallowelt
+    env.ssh_host 192.168.2.1
+
+=head1 MAGIC MARKERS
+
+  #%# family=auto
 
 =head1 AUTHOR
 
-Michael Grote
+Michael Grote - git.mgrote.net
 
 =head1 LICENSE
 
@@ -33,12 +38,6 @@ GPLv3 or later
 
 SPDX-License-Identifier: GPL-3.0-or-later
 
-=head1 MAGIC MARKERS
-
- #%# family=auto
-
-=cut
-
 EOF
 
 # set variables with default values
diff --git a/plugins/system/kernel_same_page_merging b/plugins/system/kernel_same_page_merging
index 8a24ae9b..f9fa5602 100755
--- a/plugins/system/kernel_same_page_merging
+++ b/plugins/system/kernel_same_page_merging
@@ -4,11 +4,20 @@
 : << EOF
 =head1 NAME
 
-kernel_same_page_merging - Outputs various metrics about same page merging.
+kernel_same_page_merging
+
+=head1 NOTES
+
+Outputs various metrics about kernel same page merging.
+
+=head1 MAGIC MARKERS
+
+  #%# family=auto
+  #%# capabilities=autoconf
 
 =head1 AUTHOR
 
-Michael Grote
+Michael Grote - git.mgrote.net
 
 =head1 LICENSE
 
@@ -16,14 +25,6 @@ GPLv3 or later
 
 SPDX-License-Identifier: GPL-3.0-or-later
 
-=head1 MAGIC MARKERS
-
-  #%# family=auto
-
-  #%# capabilities=autoconf
-
-=cut
-
 EOF
 
 # Variablen
diff --git a/plugins/system/zswap b/plugins/system/zswap
index 068f5693..71026547 100755
--- a/plugins/system/zswap
+++ b/plugins/system/zswap
@@ -4,22 +4,27 @@
 : << EOF
 =head1 NAME
 
-zswap - Outputs various metrics about [zswap](https://www.kernel.org/doc/html/latest/admin-guide/mm/zswap.html).
+zswap
 
-=head1 AUTHOR
+=head1 NOTES
 
-Michael Grote
+Outputs various metrics about zswap. See https://www.kernel.org/doc/html/latest/admin-guide/mm/zswap.html for more Information.
 
-=head1 Configuration
+=head1 CONFIGURATION
 
 This Plugin has to be run as root:
 
-/etc/munin/plugin-conf.d/zswap:
+  [zswap]
+    user root
 
-[zswap]
+=head1 MAGIC MARKERS
 
-user root
+  #%# family=auto
+  #%# capabilities=autoconf
 
+=head1 AUTHOR
+
+Michael Grote - git.mgrote.net
 
 =head1 LICENSE
 
@@ -27,14 +32,6 @@ GPLv3 or later
 
 SPDX-License-Identifier: GPL-3.0-or-later
 
-=head1 MAGIC MARKERS
-
-  #%# family=auto
-
-  #%# capabilities=autoconf
-
-=cut
-
 EOF
 
 
diff --git a/plugins/zfs/zfs_pool_dataset_count b/plugins/zfs/zfs_pool_dataset_count
index 5daf88ef..e1bcc4cd 100644
--- a/plugins/zfs/zfs_pool_dataset_count
+++ b/plugins/zfs/zfs_pool_dataset_count
@@ -4,11 +4,19 @@
 : << EOF
 =head1 NAME
 
-zfs_pool_dataset_count - Outputs the count of zfs pools, datasets and snapshots.
+zfs_pool_dataset_count
+
+=head1 NOTES
+
+Outputs the count of zfs pools, datasets and snapshots.
+
+=head1 MAGIC MARKERS
+
+  #%# family=auto
 
 =head1 AUTHOR
 
-Michael Grote
+Michael Grote - git.mgrote.net
 
 =head1 LICENSE
 
@@ -16,12 +24,6 @@ GPLv3 or later
 
 SPDX-License-Identifier: GPL-3.0-or-later
 
-=head1 MAGIC MARKERS
-
- #%# family=auto
-
-=cut
-
 EOF
 
 if [ "$1" = "autoconf" ]; then
diff --git a/plugins/zfs/zpool_fragmentation b/plugins/zfs/zpool_fragmentation
index f998148e..2084b414 100644
--- a/plugins/zfs/zpool_fragmentation
+++ b/plugins/zfs/zpool_fragmentation
@@ -4,23 +4,25 @@
 : << EOF
 =head1 NAME
 
-zpool_fragmentation - Outputs the zpool fragmentation per zfs pool.
+zpool_fragmentation
 
-=head1 AUTHOR
+=head1 NOTES
 
-Michael Grote
-
-=head1 LICENSE
-GPLv3 or later
-
-SPDX-License-Identifier: GPL-3.0-or-later
+Outputs the zpool fragmentation per zfs pool.
 
 =head1 MAGIC MARKERS
 
- #%# family=auto
+  #%# family=auto
 
-=cut
+=head1 AUTHOR
 
+Michael Grote - git.mgrote.net
+
+=head1 LICENSE
+
+GPLv3 or later
+
+SPDX-License-Identifier: GPL-3.0-or-later
 
 EOF