diff --git a/plugins/afk.lua b/plugins/afk.lua
index 544edec..4951598 100644
--- a/plugins/afk.lua
+++ b/plugins/afk.lua
@@ -9,4 +9,4 @@ return {
     patterns = {"^/afk(.*)$"}, 
     run = run
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/aha.png.lua b/plugins/aha.png.lua
index d812af0..da9816d 100644
--- a/plugins/aha.png.lua
+++ b/plugins/aha.png.lua
@@ -5,7 +5,7 @@ end
 return {
   description = "Aha", 
   usage = {"aha.png"},
-  patterns = {"^aha.png"}, 
+  patterns = {"^aha.png$"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/baka_bot.lua b/plugins/baka_bot.lua
index 6a284fc..ad2da00 100644
--- a/plugins/baka_bot.lua
+++ b/plugins/baka_bot.lua
@@ -10,4 +10,4 @@ return {
   patterns = {"baka bot","Baka bot","baka Bot","Baka Bot","BAKA BOT"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/barusamikosu.lua b/plugins/barusamikosu.lua
index c4677fe..406cb11 100644
--- a/plugins/barusamikosu.lua
+++ b/plugins/barusamikosu.lua
@@ -8,4 +8,4 @@ return {
   patterns = {"^/barusamiko","^/barusamikosu","^/Balsamiko Essig"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/date.lua b/plugins/date.lua
index cb3b954..f6ef487 100644
--- a/plugins/date.lua
+++ b/plugins/date.lua
@@ -1,4 +1,3 @@
-
 function run(msg, matches)
    return os.date("%d.%m.%Y")
 end
diff --git a/plugins/echo.lua b/plugins/echo.lua
index cab4716..ea1e347 100644
--- a/plugins/echo.lua
+++ b/plugins/echo.lua
@@ -1,4 +1,3 @@
-
 local function run(msg, matches)
   return matches[1]
 end
diff --git a/plugins/emoticons.lua b/plugins/emoticons.lua
index 2f1654a..d0960c2 100644
--- a/plugins/emoticons.lua
+++ b/plugins/emoticons.lua
@@ -1,5 +1,4 @@
-
-function run(msg, matches)
+function run(msg, matches)
 	return '😄😃😀😊☺️😉😍😘😚😗😙😜😝😛😳😁😔😌😒😞😣😢😂😭😪😥😰😅😓😩😫😨😱😠😡😤😖😆😋😷😎😴😵😲😟😦😧😈👿😮😬😐😕😯😶😇😏😑👲👳👮👷💂👶👦👧👨👩👴👵👱👼👸😺😸😻😽😼🙀😿😹😾👹👺🙈🙉🙊💀👽💩🔥✨🌟💫💥💢💦💧💤💨👂👀👃👅👄👍👎👌👊✊✌️👋✋👐👆👇👉👈🙌🙏☝️👏💪🚶🏃💃👫👪👬👭💏💑👯🙆🙅💁🙋💆💇💅👰🙎🙍🙇🎩👑👒👟👞👡👠👢👕👔👚👗🎽👖👘👙💼👜👝👛👓🎀🌂💄💛💙💜💚❤️💔💗💓💕💖💞💘💌💋💍💎👤👥💬👣💭🐶🐺🐱🐭🐹🐰🐸🐯🐨🐻🐷🐽🐮🐗🐵🐒🐴🐑🐘🐼🐧🐦🐤🐥🐣🐔🐍🐢🐛🐝🐜🐞🐌🐙🐚🐠🐟🐬🐳🐋🐄🐏🐀🐃🐅🐇🐉🐎🐐🐓🐕🐖🐁🐂🐲🐡🐊🐫🐪🐆🐈🐩🐾💐🌸🌷🍀🌹🌻🌺🍁🍃🍂🌿🌾🍄🌵🌴🌲🌳🌰🌱🌼🌐🌞🌝🌚🌑🌒🌓🌔🌕🌖🌗🌘🌜🌛🌙🌍🌎🌏🌋🌌🌠⭐️☀️⛅️☁️⚡️☔️❄️⛄️🌀🌁🌈🌊🎍💝🎎🎒🎓🎏🎆🎇🎐🎑🎃👻🎅🎄🎁🎋🎉🎊🎈🎌🔮🎥📷📹📼💿📀💽💾💻📱☎️📞📟📠📡📺📻🔊🔉🔈🔇🔔🔕📢📣⏳⌛️⏰⌚️🔓🔒🔏🔐🔑🔎💡🔦🔆🔅🔌🔋🔍🛁🛀🚿🚽🔧🔩🔨🚪🚬💣🔫🔪💊💉💰💴💵💷💶💳💸📲📧📥📤✉️📩📨📯📫📪📬📭📮📦📝📄📃📑📊📈📉📜📋📅📆📇📁📂✂️📌📎✒️✏️📏📐📕📗📘📙📓📔📒📚📖🔖📛🔬🔭📰🎨🎬🎤🎧🎼🎵🎶🎹🎻🎺🎷🎸👾🎮🃏🎴🀄️🎲🎯🏈🏀⚽️⚾️🎾🎱🏉🎳⛳️🚵🚴🏁🏇🏆🎿🏂🏊🏄🎣☕️🍵🍶🍼🍺🍻🍸🍹🍷🍴🍕🍔🍟🍗🍖🍝🍛🍤🍱🍣🍥🍙🍘🍚🍜🍲🍢🍡🍳🍞🍩🍮🍦🍨🍧🎂🍰🍪🍫🍬🍭🍯🍎🍏🍊🍋🍒🍇🍉🍓🍑🍈🍌🍐🍍🍠🍆🍅🌽🏠🏡🏫🏢🏣🏥🏦🏪🏩🏨💒⛪️🏬🏤🌇🌆🏯🏰⛺️🏭🗼🗾🗻🌄🌅🌃🗽🌉🎠🎡⛲️🎢🚢⛵️🚤🚣⚓️🚀✈️💺🚁🚂🚊🚉🚞🚆🚄🚅🚈🚇🚝🚋🚃🚎🚌🚍🚙🚘🚗🚕🚖🚛🚚🚨🚓🚔🚒🚑🚐🚲🚡🚟🚠🚜💈🚏🎫🚦🚥⚠️🚧🔰⛽️🏮🎰♨️🗿🎪🎭📍🚩🇯🇵🇰🇷🇩🇪🇨🇳🇺🇸🇫🇷🇪🇸🇮🇹🇷🇺🇬🇧1⃣2⃣3⃣4⃣5⃣6⃣7⃣8⃣9⃣0⃣🔟🔢#⃣🔣⬆️⬇️⬅️➡️🔠🔡🔤↗️↖️↘️↙️↔️↕️🔄◀️▶️🔼🔽↩️↪️ℹ️⏪⏩⏫⏬⤵️⤴️🆗🔀🔁🔂🆕🆙🆒🆓🆖📶🎦🈁🈯️🈳🈵🈴🈲🉐🈹🈺🈶🈚️🚻🚹🚺🚼🚾🚰🚮🅿️♿️🚭🈷🈸🈂Ⓜ️🛂🛄🛅🛃🉑㊙️㊗️🆑🆘🆔🚫🔞📵🚯🚱🚳🚷🚸⛔️✳️❇️❎✅✴️💟🆚📳📴🅰🅱🆎🅾💠➿♻️♈️♉️♊️♋️♌️♍️♎️♏️♐️♑️♒️♓️⛎🔯🏧💹💲💱©®™❌‼️⁉️❗️❓❕❔⭕️🔝🔚🔙🔛🔜🔃🕛🕧🕐🕜🕑🕝🕒🕞🕓🕟🕔🕠🕕🕖🕗🕘🕙🕚🕡🕢🕣🕤🕥🕦✖️➕➖➗♠️♥️♣️♦️💮💯✔️☑️🔘🔗➰〰〽️🔱◼️◻️◾️◽️▪️▫️🔺🔲🔳⚫️⚪️🔴🔵🔻⬜️⬛️🔶🔷🔸🔹'
 end
 
@@ -9,4 +8,4 @@ return {
   patterns = {"^/emoticons","^/Emoticons"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/facepalm.lua b/plugins/facepalm.lua
index a03eb77..2a4cebd 100644
--- a/plugins/facepalm.lua
+++ b/plugins/facepalm.lua
@@ -8,4 +8,4 @@ return {
   patterns = {"^/facepalm","^/Facepalm"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/frosch.lua b/plugins/frosch.lua
index 77f05ad..fc84bb1 100644
--- a/plugins/frosch.lua
+++ b/plugins/frosch.lua
@@ -8,4 +8,4 @@ return {
   patterns = {"^/frosch","^/Frosch"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/gay.lua b/plugins/gay.lua
index 5d0b6e7..d5f69d0 100644
--- a/plugins/gay.lua
+++ b/plugins/gay.lua
@@ -47,5 +47,5 @@ return {
     patterns = {"^/gay$"}, 
     run = run 
 }
-
 end
+--Modified by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/hallo.lua b/plugins/hallo.lua
index 3f0b3a2..6316e44 100644
--- a/plugins/hallo.lua
+++ b/plugins/hallo.lua
@@ -10,4 +10,4 @@ return {
     patterns = {"^Hallo$","^hallo$"},
 run = run
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/hdf.lua b/plugins/hdf.lua
index 1a9805b..c74e76f 100644
--- a/plugins/hdf.lua
+++ b/plugins/hdf.lua
@@ -24,4 +24,4 @@ return {
   patterns = {"^/hdf"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/img_google_nsfw.lua b/plugins/img_google_nsfw.lua
index 9e0e0f0..835eece 100644
--- a/plugins/img_google_nsfw.lua
+++ b/plugins/img_google_nsfw.lua
@@ -47,5 +47,4 @@ return {
     patterns = {"^/img2 (.*)$","^/nsfwimg (.*)$"}, 
     run = run 
 }
-
-end
+end
\ No newline at end of file
diff --git a/plugins/insider.lua b/plugins/insider.lua
index 239faea..28fc4de 100644
--- a/plugins/insider.lua
+++ b/plugins/insider.lua
@@ -1,4 +1,3 @@
-do
 function run(msg, matches)
   local answers = {'Insider: eben\nerschaffen/hauptsächlich verwendet von: pegelf\nWo eingesetzt?: sehr oft in Sätzen\nBemerkung: Ein Markenzeichen von ihm, nach Mr.DaBus Meinung.',
 				   'Insider: ebenD\nerschaffen/hauptsächlich verwendet von: Andi919\nWo eingesetzt?: immer statt dem Wort "eben"\nBemerkung: das D wird absichtlich groß geschrieben',
@@ -40,7 +39,6 @@ return {
   patterns = {"^/Insider$","^/insider$"},
   run = run
 }
-end
---by Akamaru
+--by Akamaru [https://ponywave.de]
 --'Insider: \nerschaffen/hauptsächlich verwendet von: \nWo eingesetzt?: \nBemerkung: '
 --all insider from https://wiki.pegelf.de/Insiderliste
\ No newline at end of file
diff --git a/plugins/invite.lua b/plugins/invite.lua
index 48f2008..c3e29e6 100644
--- a/plugins/invite.lua
+++ b/plugins/invite.lua
@@ -1,5 +1,5 @@
 -- Invite other user to the chat group.
--- Use !invite name User_name or !invite id id_number
+-- Use /invite name User_name or /invite id id_number
 -- The User_name is the print_name (there are no spaces but _)
 
 do
diff --git a/plugins/justkitten.lua b/plugins/justkitten.lua
index cd001a0..02d69b5 100644
--- a/plugins/justkitten.lua
+++ b/plugins/justkitten.lua
@@ -21,4 +21,4 @@ return {
   patterns = {"^/jk"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/kitty.lua b/plugins/kitty.lua
index 53aa2f0..7cb57a2 100644
--- a/plugins/kitty.lua
+++ b/plugins/kitty.lua
@@ -17,4 +17,4 @@ return {
   patterns = {"^/kitty$","^/katze$","^/cat$","^/neko$","^/kadse$"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/location.lua b/plugins/location.lua
index 1d16676..aaa64b1 100644
--- a/plugins/location.lua
+++ b/plugins/location.lua
@@ -1,4 +1,4 @@
--- Implement a command !loc [area] which uses
+-- Implement a command /loc [area] which uses
 -- the static map API to get a location image
 
 -- Not sure if this is the proper way
diff --git a/plugins/lucky_star.lua b/plugins/lucky_star.lua
index b241dea..f5e012c 100644
--- a/plugins/lucky_star.lua
+++ b/plugins/lucky_star.lua
@@ -23,4 +23,4 @@ return {
   patterns = {"^/kagami$","^/Kagami$","^/konata$","^/Konata$","^/miyuki$","^/Miyuki$","^/tsukasa$","^/Tsukasa$"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/magische_miesmuschel.lua b/plugins/magische_miesmuschel.lua
index 23cb8d0..0307ff0 100644
--- a/plugins/magische_miesmuschel.lua
+++ b/plugins/magische_miesmuschel.lua
@@ -1,5 +1,3 @@
-do
-
 function run(msg, matches)
   local answers = {'Ja','Nein','Eines Tages vielleicht'}
   return answers[math.random(#answers)]
@@ -12,5 +10,4 @@ return {
     patterns = {"^Magische Miesmuschel(.*)$","^magische Miesmuschel(.*)$","^Magische miesmuschel(.*)$","^magische miesmuschel(.*)$"}, 
     run = run
 }
-end
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/moepse.lua b/plugins/moepse.lua
index 95516c4..63e9e71 100644
--- a/plugins/moepse.lua
+++ b/plugins/moepse.lua
@@ -1,4 +1,3 @@
-
 function run(msg, matches)
 	return 'se'
 end
@@ -6,7 +5,7 @@ end
 return {
   description = "Möpse? Meepse?", 
   usage = {"möp","Möp","meep","Meep"},
-  patterns = {"^möp","Möp","meep","Meep"}, 
+  patterns = {"^möp$","Möp$","meep$","Meep$"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/myanimelist.lua b/plugins/myanimelist.lua
index 5437883..38f73b3 100644
--- a/plugins/myanimelist.lua
+++ b/plugins/myanimelist.lua
@@ -35,4 +35,5 @@ return {
     usage = {"/myanimelist [Anime]","/mal [Anime]"},
     patterns = {"^/myanimelist (.*)$","^/mal (.*)$"}, 
     run = run 
-    }
\ No newline at end of file
+    }
+--Modified by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/naira_derp.lua b/plugins/naira_derp.lua
index 0bf17c9..6f1701a 100644
--- a/plugins/naira_derp.lua
+++ b/plugins/naira_derp.lua
@@ -8,4 +8,4 @@ return {
   patterns = {"^/nairad$","^/Nairad$"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/nau.lua b/plugins/nau.lua
index 51a8257..7fc0a01 100644
--- a/plugins/nau.lua
+++ b/plugins/nau.lua
@@ -8,4 +8,4 @@ return {
   patterns = {"^/nau$","^/now$"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/neorame.lua b/plugins/neorame.lua
index 8f2f9ba..75edb1f 100644
--- a/plugins/neorame.lua
+++ b/plugins/neorame.lua
@@ -8,4 +8,4 @@ return {
   patterns = {"^/neorame"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/niissan.lua b/plugins/niissan.lua
index 7568807..d84790e 100644
--- a/plugins/niissan.lua
+++ b/plugins/niissan.lua
@@ -8,4 +8,4 @@ return {
   patterns = {"^nii-san","^Nii-san","^nissan","^Nissan"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/nope.avi.lua b/plugins/nope.avi.lua
index 667bd7c..8f8980f 100644
--- a/plugins/nope.avi.lua
+++ b/plugins/nope.avi.lua
@@ -1,4 +1,3 @@
-
 function run(msg, matches)
 	send_video(get_receiver(msg), "videos/nope.avi", ok_cb, false)
 	return 'Video wird gesendet...'
@@ -10,4 +9,4 @@ return {
   patterns = {"^nope.avi"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/nyu.lua b/plugins/nyu.lua
index 7b5e4f5..3356654 100644
--- a/plugins/nyu.lua
+++ b/plugins/nyu.lua
@@ -8,4 +8,4 @@ return {
   patterns = {"^nyu","^Nyu"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/old.lua b/plugins/old.lua
index d810d8c..f878809 100644
--- a/plugins/old.lua
+++ b/plugins/old.lua
@@ -1,4 +1,3 @@
-
 function run(msg, matches)
 	return 'Deine Mudda is old!'
 end
@@ -9,4 +8,4 @@ return {
   patterns = {"^#old$","^.#old$"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/pornhub.lua b/plugins/pornhub.lua
index 0385f6e..8eae76f 100644
--- a/plugins/pornhub.lua
+++ b/plugins/pornhub.lua
@@ -1,4 +1,3 @@
-
 function run(msg, matches)
 
 	-- local g = require "./plugins/google"
@@ -45,4 +44,5 @@ return {
     usage = {"/pornhub [Suchwort]","/ph [Suchwort]"},
     patterns = {"^/pornhub (.*)$","^/ph (.*)$"}, 
     run = run 
-    }
\ No newline at end of file
+    }
+-- Modified by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/quotes.lua b/plugins/quotes.lua
index d919c9d..d445e2c 100644
--- a/plugins/quotes.lua
+++ b/plugins/quotes.lua
@@ -1,4 +1,3 @@
-
 local quotes_file = './data/quotes.lua'
 local quotes_table
 
diff --git a/plugins/rich_bitch.lua b/plugins/rich_bitch.lua
index 822a015..88e2cd1 100644
--- a/plugins/rich_bitch.lua
+++ b/plugins/rich_bitch.lua
@@ -1,4 +1,3 @@
-
 function run(msg, matches)
 	return 'Akamaru ist nicht reich!'
 end
@@ -6,7 +5,7 @@ end
 return {
   description = "Sagt euch dass Akamaru nicht reich ist", 
   usage = {"Rich Bitch","rich bitch","rich Bitch","Rich bitch","RICH BITCH"},
-  patterns = {"^Rich Bitch","^rich bitch","^rich Bitch","^Rich bitch","^RICH BITCH"}, 
+  patterns = {"^Rich Bitch$","^rich bitch$","^rich Bitch$","^Rich bitch$","^RICH BITCH$"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/sakurasou.lua b/plugins/sakurasou.lua
index dee4e57..4d4ad56 100644
--- a/plugins/sakurasou.lua
+++ b/plugins/sakurasou.lua
@@ -32,7 +32,7 @@ end
 return {
   description = "Sendet euch ein Charakter aus Sakurasou no Pet na Kanojo", 
   usage = {"/shiina","/Shiina","/chihiro","/Chihiro","/jin","/Jin","/misaki","/Misaki","/nanami","/Nanami","/ryuunosuke","/Ryuunosuke","/sorata","/Sorata"},
-  patterns = {"^/shiina","^/Shiina","^/chihiro","^/Chihiro","^/jin","^/Jin","^/misaki","^/Misaki","^/nanami","^/Nanami","^/ryuunosuke","^/Ryuunosuke","^/sorata","^/Sorata"}, 
+  patterns = {"^/shiina$","^/Shiina$","^/chihiro$","^/Chihiro"$,"^/jin$","^/Jin$","^/misaki$","^/Misaki$","^/nanami$","^/Nanami$","^/ryuunosuke$","^/Ryuunosuke$","^/sorata$","^/Sorata$"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/screen.lua b/plugins/screen.lua
index a0f500b..bb7af55 100644
--- a/plugins/screen.lua
+++ b/plugins/screen.lua
@@ -28,4 +28,4 @@ return {
     patterns = {"^/screen$"}, 
     run = run
 }
---by Akamaru [https://ponywave.de] 
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/search_youtube.lua b/plugins/search_youtube.lua
index 78d5682..d8a19e2 100644
--- a/plugins/search_youtube.lua
+++ b/plugins/search_youtube.lua
@@ -1,4 +1,3 @@
-
 do
 
 -- HOW TO USE:
diff --git a/plugins/senran_kagura.lua b/plugins/senran_kagura.lua
index 5050f2f..599effe 100644
--- a/plugins/senran_kagura.lua
+++ b/plugins/senran_kagura.lua
@@ -47,4 +47,4 @@ return {
   patterns = {"^/asuka","^/Asuka","^/hibari","^/Hibari","^/ikaruga","^/Ikaruga","^/katsuragi","^/Katsuragi","^/yagyuu","^/Yagyuu","^/haruka","^/Haruka","^/hikage","^/Hikage","^/homura","^/Homura","^/mirai","^/Mirai","^/yomi","^/Yomi"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/sh.lua b/plugins/sh.lua
index 1e2e773..68a5fc9 100644
--- a/plugins/sh.lua
+++ b/plugins/sh.lua
@@ -1,4 +1,3 @@
-
 function run_sh(msg)
      name = get_name(msg)
      text = ''
diff --git a/plugins/spam.lua b/plugins/spam.lua
index 3fc8c78..565760f 100644
--- a/plugins/spam.lua
+++ b/plugins/spam.lua
@@ -1,4 +1,3 @@
-
 function run(msg, matches)
 	return 'SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM SPAM'
 end
@@ -9,4 +8,4 @@ return {
   patterns = {"^/spam","^/Spam","^/SPAM"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/steam.lua b/plugins/steam.lua
index d04408e..2e8cefe 100644
--- a/plugins/steam.lua
+++ b/plugins/steam.lua
@@ -70,10 +70,7 @@ end
 return {
   description = "Steam-Info",
   usage = {"store.steampowered.com/app Link","steamcommunity.com/app Link"},
-  patterns = {
-    "store.steampowered.com/app/([0-9]+)",
-	"steamcommunity.com/app/([0-9]+)"
-  },
+  patterns = {"store.steampowered.com/app/([0-9]+)","steamcommunity.com/app/([0-9]+)"},
   run = run
 }
 
diff --git a/plugins/stille.lua b/plugins/stille.lua
index d4ce695..1838e2e 100644
--- a/plugins/stille.lua
+++ b/plugins/stille.lua
@@ -17,4 +17,4 @@ return {
   run = run
 }
 end
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/time.lua b/plugins/time.lua
index 9d62ec8..01d4321 100644
--- a/plugins/time.lua
+++ b/plugins/time.lua
@@ -1,4 +1,4 @@
--- Implement a command !time [area] which uses
+-- Implement a command /time [area] which uses
 -- 2 Google APIs to get the desired result:
 --   1. Geocoding to get from area to a lat/long pair
 --   2. Timezone to get the local time in that lat/long location
@@ -75,7 +75,7 @@ end
 
 function getformattedLocalTime(area)
    if area == nil then
-      return "Die Zeit nirgendswo ist nirgendswo..."
+      return 'Die Zeit nirgendswo ist nirgendswo...'
    end
 
    lat,lng,acc = get_latlong(area)
@@ -84,7 +84,7 @@ function getformattedLocalTime(area)
    end
    local localTime, timeZoneId = get_time(lat,lng)
 
-   return "Die lokale Zeit in "..timeZoneId.." ist: ".. os.date(dateFormat,localTime) 
+   return 'Die lokale Zeit in "'..timeZoneId..'" ist: '.. os.date(dateFormat,localTime) 
 end
 
 function run(msg, matches)
@@ -93,7 +93,7 @@ end
 
 return {
     description = "Zeigt die lokale Zeit in einer Zeitzone an", 
-    usage = "/zeit [Land/Ort]",
-    patterns = {"^/zeit (.*)$","^/Zeit (.*)$"}, 
+    usage = {'/zeit [Land/Ort]'},
+    patterns = {'^/zeit (.*)$','^/Zeit (.*)$'}, 
     run = run 
 }
diff --git a/plugins/translate.lua b/plugins/translate.lua
index f9b7f06..393654f 100644
--- a/plugins/translate.lua
+++ b/plugins/translate.lua
@@ -1,7 +1,5 @@
---[[
 -- Translate text using Google Translate.
 -- http://translate.google.com/translate_a/t?client=z&ie=UTF-8&oe=UTF-8&hl=en&tl=en&text=hello
---]]
 do
 
 function translate(source_lang, target_lang, text)
diff --git a/plugins/tweet.lua b/plugins/tweet.lua
index 4b790bc..cabf5c3 100644
--- a/plugins/tweet.lua
+++ b/plugins/tweet.lua
@@ -1,4 +1,3 @@
-
 local OAuth = require "OAuth"
 
 local consumer_key = cred_data.tw_consumer_key
diff --git a/plugins/wallpaper.lua b/plugins/wallpaper.lua
index 2e05b0b..8ae9eab 100644
--- a/plugins/wallpaper.lua
+++ b/plugins/wallpaper.lua
@@ -48,4 +48,4 @@ return {
     run = run 
 }
 end
--- Original by yagop ; Modified by Akamaru
\ No newline at end of file
+-- Original by yagop ; Modified by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/wallpaper_nsfw.lua b/plugins/wallpaper_nsfw.lua
index 42b2254..6e6f05b 100644
--- a/plugins/wallpaper_nsfw.lua
+++ b/plugins/wallpaper_nsfw.lua
@@ -48,4 +48,4 @@ return {
     run = run 
 }
 end
--- Original by yagop ; Modified by Akamaru
\ No newline at end of file
+-- Original by yagop ; Modified by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/wat.lua b/plugins/wat.lua
index c658b87..2b05c89 100644
--- a/plugins/wat.lua
+++ b/plugins/wat.lua
@@ -22,7 +22,7 @@ end
 return {
   description = "Sendet eins von 6 WAT Bilder", 
   usage = {"/wat","/Wat","/WAT"},
-  patterns = {"^/wat","^/Wat","^/WAT"}, 
+  patterns = {"^/wat$","^/Wat$","^/WAT$"}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/wd.lua b/plugins/wd.lua
index 2b2ec4b..018ba26 100644
--- a/plugins/wd.lua
+++ b/plugins/wd.lua
@@ -9,4 +9,4 @@ return {
     patterns = {"^/wd$"}, 
     run = run
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/wuerfel.lua b/plugins/wuerfel.lua
index b8ab5be..af580ce 100644
--- a/plugins/wuerfel.lua
+++ b/plugins/wuerfel.lua
@@ -12,4 +12,4 @@ return {
     run = run
 }
 end
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/yolo.lua b/plugins/yolo.lua
index 476e12c..be6f937 100644
--- a/plugins/yolo.lua
+++ b/plugins/yolo.lua
@@ -1,12 +1,11 @@
-
 function run(msg, matches)
 	return 'Hä YOLO?'
 end
 
 return {
   description = "Sendet euch ein Hä YOLO?", 
-  usage = {"/yolo"},
-  patterns = {"^/yolo"}, 
+  usage = {'yolo','Yolo','YOLO'},
+  patterns = {'^yolo$','^Yolo$','^YOLO$'}, 
   run = run 
 }
---by Akamaru
\ No newline at end of file
+--by Akamaru [https://ponywave.de]
\ No newline at end of file
diff --git a/plugins/youporn.lua b/plugins/youporn.lua
index a982742..9caa044 100644
--- a/plugins/youporn.lua
+++ b/plugins/youporn.lua
@@ -1,4 +1,3 @@
-
 function run(msg, matches)
 
 	-- local g = require "./plugins/google"