diff --git a/commands/userinfo.js b/commands/userinfo.js
index c8c05ed..ffe834b 100644
--- a/commands/userinfo.js
+++ b/commands/userinfo.js
@@ -1,31 +1,17 @@
 module.exports = {
-
   name: "userinfo",
-  description: "Gets info about an user, such as ID, Discord Join date and more.",
+  description: "Gets info about an user, such as ID, Discord Join date and more",
+  syntax: "<User>",
   execute(client, message, args) {
-
-   
-
-    
-    
-    
-    const user = message.mentions.users.first();
-    var i=0;i<user.presence.activities.length;i
-    const activity = user.presence.activities[i];
-
-    if(!activity) {
-      const activity = "This user doesn't have a set status"
-    // Checks if a user was mentioned. If not, returns error message.
-    }
-
-
-
+    const {footerTxt} = require('../config.json');
+    let user = message.mentions.users.first() || args[0]
+    if (!user) user = message.author
     const embed = {
       "title": "Everything you've ever wanted to know about " + user.username + "!",
       "color": 9442302,
       "footer": {
-        "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
-        "text": "Made with ❤ in Illinois | Anitrox by IDeletedSystem644"
+        "icon_url": message.author.displayAvatarURL(),
+        "text": footerTxt
       },
       
       "thumbnail": {
@@ -33,34 +19,40 @@ module.exports = {
       },
       "fields": [
         
+        {
+          "name": "Username",
+          "value": user.username,
+          "inline": true
+        },
+        {
+          "name": "Discriminator",
+          "value": user.discriminator,
+          "inline": true
+        },
         {
           "name": "Full Username",
-          "value": user.tag
+          "value": user.tag,
+          "inline": true
         },
         {
           "name": "User Profile Picture",
           "value": user.displayAvatarURL()
         },
         {
-          "name": "User Presence",
+          "name": "User Status",
           value: user.presence.status
         },
-        {
-          "name": "Custom Status",
-           value:  activity.state
-        },
         {
           "name": "User ID",
-          "value": "``" + user.id + "``"
+          "value": "```" + user.id + "```"
         },
         {
           "name": "User Joined Discord",
           "value": user.createdAt,
           inline: true
         },
-
       ]
     };
     message.channel.send({ embed: embed });
-          }
+     }
   }