diff --git a/plugins/proxmox/proxmox_vm_count b/plugins/proxmox/proxmox_vm_count
index 641ce9b0..04a4f5c2 100644
--- a/plugins/proxmox/proxmox_vm_count
+++ b/plugins/proxmox/proxmox_vm_count
@@ -8,16 +8,15 @@ proxmox_vm_count - Outputs the running, stopped and total counts of ProxMox VMs
 
 =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 AUTHOR
 
-Michael Grote
-
+Michael Grote - git.mgrote.net
 
 =head1 LICENSE
 
@@ -27,10 +26,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 =head1 MAGIC MARKERS
 
- #%# family=auto
- #%# capabilities=autoconf suggest
-
-=cut
+  #%# family=auto
+  #%# capabilities=autoconf
 
 EOF
 
diff --git a/plugins/router/mikrotik_system b/plugins/router/mikrotik_system
index 2a09032b..ab706e13 100755
--- a/plugins/router/mikrotik_system
+++ b/plugins/router/mikrotik_system
@@ -4,28 +4,29 @@
 : << EOF
 =head1 NAME
 
-mikrotik_system - This plugin fetches multiple Values from a mikrotik device.
+mikrotik_system - This plugin fetches multiple values from a mikrotik device.
+
+=head1 NOTES
+
+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 AUTHOR
 
-Michael Grote
+Michael Grote - git.mgrote.net
 
 =head1 LICENSE
 
@@ -35,9 +36,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 =head1 MAGIC MARKERS
 
- #%# family=auto
-
-=cut
+  #%# family=auto
+  #%# capabilities=autoconf
 
 EOF
 
diff --git a/plugins/system/kernel_same_page_merging b/plugins/system/kernel_same_page_merging
index bf14026f..01273412 100755
--- a/plugins/system/kernel_same_page_merging
+++ b/plugins/system/kernel_same_page_merging
@@ -3,27 +3,25 @@
 
 : << EOF
 =head1 NAME
-kernel_same_page_merging - Outputs various metrics about same page merging.
+
+kernel_same_page_merging - Outputs various metrics about kernel same page merging.
 
 =head1 AUTHOR
-=over 4
-=item * Michael Grote
-=back
+
+Michael Grote - git.mgrote.net
 
 =head1 LICENSE
+
 GPLv3 or later
 
 SPDX-License-Identifier: GPL-3.0-or-later
 
 =head1 MAGIC MARKERS
-=begin comment
-These magic markers are used by munin-node-configure when installing
-munin-node.
-=end comment
+
   #%# family=auto
-=cut
+  #%# capabilities=autoconf
+
 EOF
-#
 
 # Variablen
 ksm_dir_run="/sys/kernel/mm/ksm/run"
diff --git a/plugins/system/zswap b/plugins/system/zswap
index 068f5693..3c022aa7 100755
--- a/plugins/system/zswap
+++ b/plugins/system/zswap
@@ -4,22 +4,22 @@
 : << EOF
 =head1 NAME
 
-zswap - Outputs various metrics about [zswap](https://www.kernel.org/doc/html/latest/admin-guide/mm/zswap.html).
+zswap - Outputs various metrics about zswap.
 
-=head1 AUTHOR
+=head1 NOTES
 
-Michael Grote
+ 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]
-
-user root
+=head1 AUTHOR
 
+Michael Grote - git.mgrote.net
 
 =head1 LICENSE
 
@@ -30,11 +30,8 @@ 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 98d6d445..c3ceb853 100644
--- a/plugins/zfs/zfs_pool_dataset_count
+++ b/plugins/zfs/zfs_pool_dataset_count
@@ -8,7 +8,7 @@ zfs_pool_dataset_count - Outputs the count of zfs pools, datasets and snapshots.
 
 =head1 AUTHOR
 
-Michael Grote
+Michael Grote - git.mgrote.net
 
 =head1 LICENSE
 
@@ -18,9 +18,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
 
 =head1 MAGIC MARKERS
 
- #%# family=auto
-
-=cut
+  #%# family=auto
+  #%# capabilities=autoconf
 
 EOF
 
diff --git a/plugins/zfs/zpool_fragmentation b/plugins/zfs/zpool_fragmentation
index f998148e..ea8badd2 100644
--- a/plugins/zfs/zpool_fragmentation
+++ b/plugins/zfs/zpool_fragmentation
@@ -8,19 +8,18 @@ zpool_fragmentation - Outputs the zpool fragmentation per zfs pool.
 
 =head1 AUTHOR
 
-Michael Grote
+Michael Grote - git.mgrote.net
 
 =head1 LICENSE
+
 GPLv3 or later
 
 SPDX-License-Identifier: GPL-3.0-or-later
 
 =head1 MAGIC MARKERS
 
- #%# family=auto
-
-=cut
-
+  #%# family=auto
+  #%# capabilities=autoconf
 
 EOF