diff --git a/commands.md b/commands.md
index 713e94b..4a99be3 100644
--- a/commands.md
+++ b/commands.md
@@ -1,4 +1,27 @@
 # Anitrox Command List 
-|Command|Arguments |
-|-------|----------|
-|Help   |none      |
+<> = Optionable
+<br>
+[] = Required
+
+|Command|Arguments |Description |
+|-------|----------|------------|
+|Help   |none      |Help? Help!!|
+|8ball  |[Question]|Ask a question, Any question! |
+|avatar |\<Member\>  |Get a users beautiful avatar |
+|bonk   |[Member]  | Bonk, no horny. |
+|cheese |\<Member\>| Cheese.|
+|cuddle |[Member]  | Cuddle someone! | 
+|hug    |[Member]  | Hug someone! | 
+|info   |none      | Information about the bot and host.
+|invite |none      | Invite Anitrox to your server!
+|kiss   |[Member]  | Kiss someone! | 
+|leskiss|[Member]  | Lesbain kiss (Suggested by Emi)
+|lick   |[Member]  | Did you just lick me!?
+|nom    |[Member]  | Nom someone or something
+|opensource| none  | Source code for Anitrox
+|pat    |[Member]  | Pat someone!
+|ping   |none      | Ping Elon Musk! or Mars! nah jk, Discord.
+|poke   |[Member]  | Poke someone!
+|slap   |[Member]  | Slap someone :(
+|snuggle|[Member]  | Snuggle someone!
+|uinfo  |[Member]  | Information about an user
\ No newline at end of file
diff --git a/commands/avatar.js b/commands/avatar.js
index 061104c..3741e6e 100644
--- a/commands/avatar.js
+++ b/commands/avatar.js
@@ -2,15 +2,17 @@ module.exports = {
     name: "avatar",
     description: "Gets a users avatar.",
     execute(client, message, args) {
-    const user = message.mentions.users.first()
+      user = message.mentions.users.first()
+      if (!user) user = message.author
+
+    const {footerTxt} = require('../config.json');
 
     const embed = {
-        "title": ":frame_photo: " + user.username + "'s Avatar",
-        "description": "Here is " +  user.username + "'s avatar!",
+        "title": ":frame_photo: " + user.username + "'s Beautiful Avatar!",
         "color": 9442302,
         "footer": {
-          "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
-          "text": "Made with ❤ in Illinois | Anitrox © IDeletedSystem64 2018-2021"
+          "icon_url": message.author.displayAvatarURL(),
+          "text": footerTxt
         },
         "image": {
           "url": user.displayAvatarURL()
diff --git a/commands/userinfo.js b/commands/uinfo.js
similarity index 94%
rename from commands/userinfo.js
rename to commands/uinfo.js
index d8adc8a..0cb944f 100644
--- a/commands/userinfo.js
+++ b/commands/uinfo.js
@@ -1,5 +1,5 @@
 module.exports = {
-  name: "userinfo",
+  name: "uinfo",
   description: "Gets info about an user, such as ID, Discord Join date and more",
   syntax: "<User>",
   execute(client, message, args) {