diff --git a/commands/bonk.js b/commands/bonk.js
index 955263f..6d6d313 100644
--- a/commands/bonk.js
+++ b/commands/bonk.js
@@ -8,7 +8,7 @@ module.exports = {
 
           const embed = {
             "title": "<a:SylvBonk:801185845847130113> Bonk",
-            "description": taggedUser + " You have been bonked by " + messageAuthor + "!",
+            "description": "<@" + taggedUser + ">" + " You have been bonked by <@" + messageAuthor + ">!",
             "color": 3272562,
             "footer": {
               "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
@@ -18,9 +18,8 @@ module.exports = {
               "url": "https://cdn.discordapp.com/attachments/793537380330111028/801194481549312060/HappyBONK.gif"
             }
           }
-         
-            
-          message.channel.send({ embed: embed });             
+
+
+          message.channel.send({ embed: embed });
             }
     }
-
diff --git a/commands/config.json b/commands/config.json
new file mode 100644
index 0000000..054d70b
--- /dev/null
+++ b/commands/config.json
@@ -0,0 +1,5 @@
+{
+  "prefix": "n!",
+  "token": "NTQwOTQxNjc5MDQ2Mjk1NTUz.XotbnA.0hllsNlr9hWaepl3KwB1Bhh5TnA",
+  "ownerID": "309427567004483586"
+}
\ No newline at end of file
diff --git a/commands/cuddle.js b/commands/cuddle.js
index 90a156b..1b1ed9e 100644
--- a/commands/cuddle.js
+++ b/commands/cuddle.js
@@ -7,7 +7,7 @@ module.exports = {
       const taggedUser = message.mentions.users.first();
           const embed = {
             "title": ":heart: Cuddle",
-            "description": taggedUser + " You have been cuddled by " + messageAuthor + "!",
+            "description": "<@" + taggedUser + ">" + " You have been cuddled by " + "<@" + messageAuthor + ">!",
             "color": 8311585,
             "footer": {
               "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
@@ -17,8 +17,8 @@ module.exports = {
               "url": "https://media.tenor.com/images/7199fdd26fc2c07cd49a34fda3fc37a8/tenor.gif"
             }
           }
-         
-            
-          message.channel.send({ embed: embed });             
+
+
+          message.channel.send({ embed: embed });
             }
     }
diff --git a/commands/eval.js b/commands/eval.js
index c4a43c8..8d3eb19 100644
--- a/commands/eval.js
+++ b/commands/eval.js
@@ -1,6 +1,6 @@
 
 module.exports = {
-	
+
 	name: 'eval',
 	description: 'Runs js code',
 	execute(client, message, args) {
@@ -9,14 +9,31 @@ module.exports = {
             try {
               const code = args.join(" ");
               let evaled = eval(code);
-         
+
               if (typeof evaled !== "string")
                 evaled = require("util").inspect(evaled);
-         
+
               message.channel.send(clean(evaled), {code:"xl"});
-            } catch (err) {
-              console.log("An error occurred while running that code!")
-        
+						} catch (error) {
+							const embed = {
+								"title": "<:NyabotError:697145462347661412> **Well that happened...**",
+								"color": 13632027,
+								"footer": {
+								  "icon_url": "https://cdn.discordapp.com/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
+								  "text": "Anitrox © IDeletedSystem64 2018-2021 All Rights Reserved."
+								},
+								"fields": [
+								  {
+									"name": "**What Happened?**",
+									"value": "The command you tried to run failed to execute due to an error."
+								  },
+								  {
+									"name": "Error Info",
+									"value": error.message
+								  }
+								]
+							  };
+							  message.channel.send({ embed });
 	}
 };
     }
diff --git a/commands/hug.js b/commands/hug.js
index 1501c84..708e902 100644
--- a/commands/hug.js
+++ b/commands/hug.js
@@ -7,7 +7,7 @@ module.exports = {
       const taggedUser = message.mentions.users.first();
           const embed = {
             "title": "<a:ABlobCatHuggle:801232248035999784> Hug",
-            "description": taggedUser + " You have been hugged by " + messageAuthor + "!",
+            "description": "<@" + taggedUser + ">" + " You have been hugged by " + "<@" + messageAuthor + ">!",
             "color": 8311585,
             "footer": {
               "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
@@ -17,8 +17,8 @@ module.exports = {
               "url": "https://i.imgur.com/r9aU2xv.gif?noredirect"
             }
           }
-         
-            
-          message.channel.send({ embed: embed });             
+
+
+          message.channel.send({ embed: embed });
             }
     }
diff --git a/commands/info.js b/commands/info.js
index 573bd7c..8fcd5ec 100644
--- a/commands/info.js
+++ b/commands/info.js
@@ -24,8 +24,8 @@ module.exports = {
 
 
 
-const version = ("Public Test Buld 4, Based on dev Build 429")
-    const release = ("anitrox_ptb")
+const version = ("dev build 429")
+    const release = ("anitrox_dev")
     const os = require("os")
 
     const embed = {
diff --git a/commands/kiss.js b/commands/kiss.js
index c184a98..d28762a 100644
--- a/commands/kiss.js
+++ b/commands/kiss.js
@@ -7,7 +7,7 @@ module.exports = {
       const taggedUser = message.mentions.users.first();
           const embed = {
             "title": ":heart: Kiss",
-            "description": taggedUser + " You have been kissed by " + messageAuthor + "!",
+            "description": "<@" + taggedUser + ">" + " You have been kissed by <@" + messageAuthor + ">!",
             "color": 8311585,
             "footer": {
               "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
@@ -17,8 +17,8 @@ module.exports = {
               "url": "https://i.pinimg.com/originals/e3/4e/31/e34e31123f8f35d5c771a2d6a70bef52.gif"
             }
           }
-         
-            
-          message.channel.send({ embed: embed });             
+
+
+          message.channel.send({ embed: embed });
             }
     }
diff --git a/commands/nom.js b/commands/nom.js
index 08a049f..4862d5d 100644
--- a/commands/nom.js
+++ b/commands/nom.js
@@ -7,7 +7,7 @@ module.exports = {
       const taggedUser = message.mentions.users.first();
           const embed = {
             "title": "<:BlobNomBlob:801241117919805510> Nom",
-            "description": taggedUser + " You have been nommed by " + messageAuthor + "!",
+            "description": "<@" + taggedUser + "> You have been nommed by <@" + messageAuthor + ">!",
             "color": 8311585,
             "footer": {
               "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
@@ -17,8 +17,8 @@ module.exports = {
               "url": "https://data.whicdn.com/images/279560594/original.gif"
             }
           }
-         
-            
-          message.channel.send({ embed: embed });             
+
+
+          message.channel.send({ embed: embed });
             }
     }
diff --git a/commands/pat.js b/commands/pat.js
index 92be259..b45dbe6 100644
--- a/commands/pat.js
+++ b/commands/pat.js
@@ -7,7 +7,7 @@ module.exports = {
       const taggedUser = message.mentions.users.first();
           const embed = {
             "title": "<:pats:801238281286713355> Pat",
-            "description": taggedUser + " You have been patted by " + messageAuthor + "!",
+            "description": "<@" + taggedUser + "> You have been patted by <@" + messageAuthor + ">!",
             "color": 8311585,
             "footer": {
               "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
@@ -17,8 +17,8 @@ module.exports = {
               "url": "https://media1.giphy.com/media/ARSp9T7wwxNcs/giphy.gif"
             }
           }
-         
-            
-          message.channel.send({ embed: embed });             
+
+
+          message.channel.send({ embed: embed });
             }
     }
diff --git a/commands/ping.js b/commands/ping.js
new file mode 100644
index 0000000..e137f35
--- /dev/null
+++ b/commands/ping.js
@@ -0,0 +1,17 @@
+module.exports = {
+  name: "ping",
+  description: "Gets bot ping",
+  execute(client, message, args) {
+    const embed = {
+  "title": ":ping_pong: Ping",
+  "color": 15433939,
+  "fields": [
+    {
+      "name": "Ping is " + client.ws.ping + " ms",
+      "value": "If this is more than 1500ms there may be a problem!"
+    }
+  ]
+};
+message.channel.send({ embed });
+  }
+};
diff --git a/commands/poke.js b/commands/poke.js
index cf457c7..8bcb73a 100644
--- a/commands/poke.js
+++ b/commands/poke.js
@@ -7,7 +7,7 @@ module.exports = {
       const taggedUser = message.mentions.users.first();
           const embed = {
             "title": "👉 Poke!",
-            "description": taggedUser + " You have been poked by " + messageAuthor + "!",
+            "description": "<@" + taggedUser + "> You have been poked by <@" + messageAuthor + ">!",
             "color": 8311585,
             "footer": {
               "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
@@ -17,8 +17,8 @@ module.exports = {
               "url": "https://i.gifer.com/4IdP.gif"
             }
           }
-         
-            
-          message.channel.send({ embed: embed });             
+
+
+          message.channel.send({ embed: embed });
             }
     }
diff --git a/commands/reload.js b/commands/reload.js
index ad9a103..475bb7c 100644
--- a/commands/reload.js
+++ b/commands/reload.js
@@ -20,7 +20,7 @@ module.exports = {
 			console.log('User reloaded ${command.name}.')
 		} catch (error) {
 			console.error(error);
-			message.channel.send(`There was an error while reloading a command \`${command.name}\`:\n\`${error.message}\``);
+			message.channel.send(`There was an error while reloading \`${command.name}\`:\n\`${error.message}\``);
 		}
 	},
 };
\ No newline at end of file
diff --git a/commands/restart.js b/commands/restart.js
index aca1d34..808a95e 100644
--- a/commands/restart.js
+++ b/commands/restart.js
@@ -3,15 +3,19 @@ module.exports = {
     name: 'restart',
     description: '(Owner Only) Shuts down the bot.',
     execute(client, message, args) {
-     const token=("<token>")
+        const { token } = require('./config.json');
         if (message.author.id == 309427567004483586) {
             message.channel.send("<a:NyabotWorking:697147309531594843> Restarting...").then
             client.destroy()
             .catch(console.error)
         .then
+        console.log("Restarting!")
+        console.log("Getting ready")
+        console.log("Ready to start!")
         client.login(token);
         message.channel.send("<:NyabotSuccess:697211376740859914> Restart Successful")
+        console.log("All systems go")
         } else {
             message.channel.send("<:NyabotDenied:697145462565896194> Access Denied, You must be bot owner to execute this command.");
         }
-    }}
\ No newline at end of file
+    }}
diff --git a/commands/slap.js b/commands/slap.js
index b1f0c37..74bf202 100644
--- a/commands/slap.js
+++ b/commands/slap.js
@@ -7,7 +7,7 @@ module.exports = {
       const taggedUser = message.mentions.users.first();
           const embed = {
             "title": ":anger: Slap",
-            "description": taggedUser + " You have been slapped by " + messageAuthor + "!",
+            "description": "<@" + taggedUser + "> You have been slapped by <@" + messageAuthor + ">!",
             "color": 8311585,
             "footer": {
               "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
@@ -17,8 +17,8 @@ module.exports = {
               "url": "https://media1.tenor.com/images/b6d8a83eb652a30b95e87cf96a21e007/tenor.gif?itemid=10426943"
             }
           }
-         
-            
-          message.channel.send({ embed: embed });             
+
+
+          message.channel.send({ embed: embed });
             }
     }
diff --git a/commands/userinfo.js b/commands/userinfo.js
index 80930f7..33f006a 100644
--- a/commands/userinfo.js
+++ b/commands/userinfo.js
@@ -1,91 +1,42 @@
-const { User } = require("discord.js");
-
-
-module.exports = {
-	
-	name: 'userinfo',
-	description: 'Shows information about you or another user.',
-	execute(client, message, args) {
-    const taggedUser = message.mentions.users.first();
-    
-
-    //Actual code
-    const embed = {
-            "title": "<:userinfo:793885335498522685> **User Information**",
-            "description": "Everything you've ever wanted to know about **" + taggedUser.username + ("!**"),
-            "color": 11038194,
-            
-            "footer": {
-              "icon_url": "https://cdn.discordapp.com/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
-              "text": "Anitrox © IDeletedSystem64 2018-2021. All Rights Reserved"
-            },
-            "thumbnail": {
-              "url": taggedUser.displayAvatarURL({ dynamic: true })
-            },
-            "fields": [
-              {
-                "name": "<:userquestion:793984046912110633> **Full Username**",
-                "value": taggedUser.username + ("#") + taggedUser.discriminator
-              },
-              {
-                "name": "<:userquestion:793984046912110633> User Status",
-                "value": taggedUser.status,
-                "value": taggedUser.presence
-              },
-              {
-                "name": "<:userquestion:793984046912110633> User ID",
-                "value": taggedUser.id
-              },
-              {
-                "name": "<:userquestion:793984046912110633> User Joined Discord",
-                "value": taggedUser.CreatedAt,
-                "inline": true
-              },
-              {
-                "name": "<:userquestion:793984046912110633> User Joined Server",
-                "value": "tba",
-                "inline": true
-              }
-            ]
-          };
-          message.channel.send({ embed });
-        }
-      };
-=======
-  name: "userinfo",
-  description: "Gets info about an user, such as ID, Discord Join date and more.",
-  execute(client, message, args) {
-
-    const taggedUser = message.mentions.users.first();
-    const embed = {
-      "title": "Everything you've ever wanted to know about " + taggedUser.username + "!",
-      "color": 172544,
-      "footer": {
-        "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
-        "text": "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64"
-      },
-      
-      "thumbnail": {
-        "url": "https://cdn.discordapp.com/embed/avatars/0.png"
-      },
-      "fields": [
-        {
-          "name": "Full Username",
-          "value": taggedUser.tag
-        },
-        {
-          "name": "User ID",
-          "value": "``" + taggedUser.id + "``"
-        },
-        {
-          "name": "User Joined Discord",
-          "value": "This will be added in a future release",
-          inline: true
-        },
-       
-      ]
-    };
-    message.channel.send({ embed: embed });         
-          }
-  }
-
+module.exports = {
+
+  name: "userinfo",
+  description: "Gets info about an user, such as ID, Discord Join date and more.",
+  execute(client, message, args) {
+
+    const taggedUser = message.mentions.users.first();
+    const embed = {
+      "title": "Everything you've ever wanted to know about " + taggedUser.username + "!",
+      "color": 172544,
+      "footer": {
+        "icon_url": "https://media.discordapp.net/attachments/549707869138714635/793524910172667964/Screenshot_26.png",
+        "text": "Made with ❤ in Illinois | Anitrox © 2018-2021 IDeletedSystem64"
+      },
+
+      "thumbnail": {
+        "url": taggedUser.displayAvatarURL()
+      },
+      "fields": [
+        {
+          "name": "Attention",
+          "value": "This command isn't yet finished, More info will be added soon!"
+        },
+        {
+          "name": "Full Username",
+          "value": taggedUser.tag
+        },
+        {
+          "name": "User ID",
+          "value": "``" + taggedUser.id + "``"
+        },
+        {
+          "name": "User Joined Discord",
+          "value": taggedUser.createdAt,
+          inline: true
+        },
+
+      ]
+    };
+    message.channel.send({ embed: embed });
+          }
+  }