diff --git a/commands/utility/server.js b/commands/utility/server.js
index 75c11af5..53d23069 100644
--- a/commands/utility/server.js
+++ b/commands/utility/server.js
@@ -5,21 +5,22 @@ module.exports = class ServerCommand extends Command {
         super(client, {
             name: 'server',
             group: 'utility',
+            guildOnly: 'true',
             memberName: 'server',
-            description: 'very yes',
+            description: 'Show some stats about the server',
         });
     }
 
     async run(message) {
-        const serverStatsEmbed = new Discord.RichEmbed()
-    .setColor('#0099ff')
-    .setTitle('Stats of the server')
-    .setDescription('Some description here')
-    .setThumbnail(message.guild.iconURL)
-    .addField(`Member: **${message.guild.memberCount}** \n Channel: **${message.guild.channels}**`)
-    .addBlankField()
-    .setTimestamp()
-
-    message.say(serverStatsEmbed);
+    const addEmbed = {
+        color: 0x0099ff,
+        title: 'Stats of the server',
+        thumbnail: {
+        url: `${message.guild.iconURL}`,
+    },
+        description: `Member: **${message.guild.memberCount}** \nChannel number: **${message.guild.channels.size}**\nGuild created at **${message.guild.createdAt}**\nOwner: **${message.guild.owner}**`,
+    };
+    
+    message.say({ embed: addEmbed });
     }
 };
\ No newline at end of file
diff --git a/commands/utility/stats.js b/commands/utility/stats.js
index 28d05c72..2ec374e4 100644
--- a/commands/utility/stats.js
+++ b/commands/utility/stats.js
@@ -10,6 +10,13 @@ module.exports = class MeowCommand extends Command {
     }
 
     async run(message) {
-        return message.channel.send(`Servers: \`${this.client.guilds.size}\`\nChannels: \`${this.client.channels.size}\`\nUsers: \`${this.client.users.size}\`\nBot uptime: \`${process.uptime()}\``);
+        let totalSeconds = (this.client.uptime / 1000);
+        let days = Math.floor(totalSeconds / 86400);
+        let hours = Math.floor(totalSeconds / 3600);
+        totalSeconds %= 3600;
+        let minutes = Math.floor(totalSeconds / 60);
+        let seconds = totalSeconds % 60;
+        let uptime = `${days} days, ${hours} hours, ${minutes} minutes and ${seconds} seconds`;
+        return message.channel.send(`Servers: \`${this.client.guilds.size}\`\nChannels: \`${this.client.channels.size}\`\nUsers: \`${this.client.users.size}\`\nBot uptime: \`${uptime}\``);
     }
 };
\ No newline at end of file
diff --git a/index.js b/index.js
index 1a36c33c..911ba518 100644
--- a/index.js
+++ b/index.js
@@ -16,10 +16,10 @@ const client = new CommandoClient({
 client.registry
     .registerDefaultTypes()
     .registerGroups([
-        ['fun',     'Fun commands'],
-        ['utility', 'Some useful commands'],
-        ['admin',   'Commands to make admin life easier'],
-        ['owner',   'Commands the owner can use to manage the bot'],
+        ['fun',     'Fun'],
+        ['utility', 'Utility'],
+        ['admin',   'Admins'],
+        ['owner',   'Owner'],
     ])
     .registerDefaultGroups()
     .registerDefaultCommands()
@@ -40,33 +40,34 @@ client.registry
     client.on("guildCreate", guild => {
         console.log(`${guild.name}\n${guild.memberCount} users\nOwner: ${guild.owner}`);
         const channel = client.channels.get('487766113292124160');
-        const exampleEmbed = {
+        const addEmbed = {
             color: 0x008000,
             title: 'Someone added the bot! :D YAY',
             description: `${guild.name}\n${guild.memberCount} users\nOwner: ${guild.owner}`,
             timestamp: new Date(),
         };
         
-        channel.send({ embed: exampleEmbed });
+        channel.send({ embed: addEmbed });
     })
 //  When bot get kicked from a guild send embeds with details about it.
     client.on("guildDelete", guild => {
         console.log(`***BOT KICKED***\n${guild.name}\n${guild.memberCount} users\nOwner: ${guild.owner}\n***BOT KICKED***`);
         const channel = client.channels.get('487766113292124160');
-        const exampleEmbed = {
+        const kickEmbed = {
             color: 0xFF0000,
             title: 'Someone removed the bot :(',
             description: `${guild.name}\n${guild.memberCount} users\nOwner: ${guild.owner}`,
             timestamp: new Date(),
         };
         
-        channel.send({ embed: exampleEmbed });
+        channel.send({ embed: kickEmbed });
     })
 
 //  Auto respond to messages
     client.on("message", (message) => {
-        if(responseObject[message.content]) {
-          message.channel.send(responseObject[message.content]);
+        let message_content = message.content.toLowerCase();
+        if(responseObject[message_content]) {
+          message.channel.send(responseObject[message_content]);
         }
       });