diff --git a/commands/clearwarnings.js b/commands/clearwarnings.js
index eea040c..a9fd5da 100644
--- a/commands/clearwarnings.js
+++ b/commands/clearwarnings.js
@@ -13,7 +13,7 @@ module.exports = {
     },
     help: new Discord.MessageEmbed()
         .setTitle("Help -> Warn Clearing")
-        .setDescription("Clears the warnigns of a user")
+        .setDescription("Clears the warnings of a user")
         .addField("Syntax", "`clearwarnings <@user|userID>`")
         .addField("Notice", "You must be a server administrator in order to use this command."),
     async execute(message, msg, args, cmd, prefix, mention, client) {
diff --git a/commands/response.js b/commands/response.js
index b1dcd99..c6df9b2 100644
--- a/commands/response.js
+++ b/commands/response.js
@@ -1,4 +1,5 @@
 const Discord = require('discord.js');
+
 const GuildData = require('../models/guild');
 const Responses = require('../models/responses');
 
@@ -24,7 +25,7 @@ module.exports = {
     async execute(message, msg, args, cmd, prefix, mention, client) {
         if (!message.guild) {return message.reply("You must be in a server to use this command.");}
         let tg = await GuildData.findOne({gid: message.guild.id});
-        if (!tg && !['q', 'quick'].includes(args[0].toLowerCase()) && (tg.staffrole.length && !message.member.roles.cache.has(tg.staffrole)) && message.member.permissions.has("ADMINISTRATOR")) {return message.reply("you need to be staff or admin in this server in order to edit those settings.");}
+        if (!['q', 'quick'].includes(args[0].toLowerCase()) && ((tg && tg.staffrole.length && !message.member.roles.cache.has(tg.staffrole))) && !message.member.permissions.has("ADMINISTRATOR")) {return message.reply("you need to be staff or admin in this server in order to edit those settings.");}
         if (!args.length) {return message.channel.send(`Syntax: \`${prefix}response <new|edit|view|list|delete|test|quick>\``);}
 
         if (args.length < 1) {return message.reply("You have to tell me what I'm supposed to find or save!");}
diff --git a/commands/welcome.js b/commands/welcome.js
index 682028d..fe0d511 100644
--- a/commands/welcome.js
+++ b/commands/welcome.js
@@ -23,7 +23,7 @@ module.exports = {
         let tg = await GuildData.findOne({gid: message.guild.id}) ? await GuildData.findOne({gid: message.guild.id}) : new GuildData({gid: message.guild.id});
         if (!args.length) {return message.channel.send(`Syntax: \`${prefix}welcome <set|clear|view|test>\``);}
         if (['v', 'view', 'c', 'check'].includes(args[0].toLowerCase())) {}
-        if ((!tg.staffrole.length || !message.member.roles.cache.has(tg.staffrole)) && !message.member.permissions.has("ADMINISTRATOR")) {return message.reply("You can't do that without staff or admin permissions, silly!");}
+        if ((!tg || !tg.staffrole.length || !message.member.roles.cache.has(tg.staffrole)) && !message.member.permissions.has("ADMINISTRATOR")) {return message.reply("You can't do that without staff or admin permissions, silly!");}
 
         if (['s', 'set'].includes(args[0].toLowerCase())) {
             if (!args[1]) {return message.reply("You need to specify a channel for your welcome messages to be sent in!");}
diff --git a/events/message.js b/events/message.js
index 41ed36a..45f7a2c 100644
--- a/events/message.js
+++ b/events/message.js
@@ -53,6 +53,7 @@ module.exports = async (client, message) => {
             message.channel.startTyping();
             await wait(800);
             message.channel.stopTyping();
+            if (command.meta && command.meta.guildOnly && !message.guild) {return message.channel.send("You must be in a server to use this command!");}
             require('../util/oncommand')(message, msg, args, cmd, prefix, mention, client);
             return command.execute(message, msg, args, cmd, prefix, mention, client);
         }
diff --git a/template.js b/template.js
index 74475a2..8cbfcff 100644
--- a/template.js
+++ b/template.js
@@ -4,15 +4,11 @@ module.exports = {
     name: "",
     aliases: [],
     meta: {
-        category: "",
-        perms: "",
-        staff: false,
-        vip: "",
-        serverPerms: [],
-        writtenBy: "",
-        serverOnly: false
+        category: '',
+        description: "",
+        syntax: '` <>`',
+        extra: null
     },
-    tags: [],
     help: new Discord.MessageEmbed()
     .setTitle("Help -> ")
     .setDescription("")
@@ -30,15 +26,11 @@ module.exports = {
     name: "",
     aliases: [],
     meta: {
-        category: "",
-        perms: "",
-        staff: false,
-        vip: "",
-        serverPerms: [],
-        writtenBy: "",
-        serverOnly: false
+        category: '',
+        description: "",
+        syntax: '` <>`',
+        extra: null
     },
-    tags: [],
     help: "",
     async execute(message, msg, args, cmd, prefix, mention, client) {
         if (!args.length) {return message.channel.send(`Syntax: \`${prefix}\``);}