diff --git a/TShockAPI/ConfigFile.cs b/TShockAPI/ConfigFile.cs
index 2f99581d..17f7e42c 100644
--- a/TShockAPI/ConfigFile.cs
+++ b/TShockAPI/ConfigFile.cs
@@ -16,117 +16,169 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
+using System.Linq;
+using System.Text;
 using Newtonsoft.Json;
 
 namespace TShockAPI
 {
     public class ConfigFile
     {
+        [Description("The equation for calculating invasion size is 100 + (multiplier * (number of active players with greater than 200 health))")]
         public int InvasionMultiplier = 1;
+        [Description("The default maximum mobs that will spawn per wave. Higher means more mobs in that wave.")]
         public int DefaultMaximumSpawns = 4;
+        [Description("The delay between waves. Shorter values lead to less mobs.")]
         public int DefaultSpawnRate = 700;
+        [Description("The port the server runs on.")]
         public int ServerPort = 7777;
+        [Description("Enable or disable the whitelist based on IP addresses in whitelist.txt")]
         public bool EnableWhitelist;
+        [Description("Enable the ability for invaison size to never decrease. Make sure to run /invade, and note that this adds 2 million+ goblins to the spawn que for the map.")]
         public bool InfiniteInvasion;
+        [Description("Enable or disable perma pvp.")]
         public bool AlwaysPvP;
+        [Description("Kicks players who edit save files for cheating.")]
         public bool KickCheaters = true;
+        [Description("")]
         public bool BanCheaters = true;
+        [Description("")]
         public bool KickGriefers = true;
+        [Description("")]
         public bool BanGriefers = true;
+        [Description("Bans players who attempt to kill tiles using TNT or exploits. Requires kick to be enabled.")]
         public bool BanKillTileAbusers = true;
+        [Description("Kicks players who attempt to kill tiles using TNT or exploits.")]
         public bool KickKillTileAbusers = true;
+        [Description("Bans players who attempt to throw a bomb or dynamite.")]
         public bool BanExplosives = true;
+        [Description("Kicks players who attempt to throw a bomb or dynamite.")]
         public bool KickExplosives = true;
+        [Description("Explosives won't break blocks")]
         public bool DisableExplosives = true;
+        [Description("Prevents tiles from being placed within SpawnProtectionRadius of the default spawn.")]
         public bool SpawnProtection = true;
+        [Description("Radius from spawn tile for SpawnProtection.")]
         public int SpawnProtectionRadius = 5;
-        public string DistributationAgent = "facepunch";
+        [Description("Max slots for the server. If you want people to be kicked with \"Server is full\" set this to how many players you want max and then set Terraria max players to 2 higher.")]
         public int MaxSlots = 8;
+        [Description("Global protection agent for any block distance based anti-grief check.")]
         public bool RangeChecks = true;
+        [Description("Enable/Disable Terrarias built in spam checks.")]
         public bool SpamChecks;
+        [Description("Disables any building; placing of blocks")]
         public bool DisableBuild;
+        [Description("Kick a player if they exceed this number of tile kills within 1 second.")]
         public int TileThreshold = 60;
-
+        [Description("#.#.#. = Red/Blue/Green - RGB Colors for the Admin Chat Color. Max value: 255")]
         public float[] SuperAdminChatRGB = { 255, 0, 0 };
+        [Description("The Chat Prefix before an admin speaks. eg. *The prefix was set to \"(Admin) \", so.. (Admin) : Hi! Note: If you put a space after the prefix, it will look like this: (Admin) <TerrariaDude): Hi!")]
         public string AdminChatPrefix = "(Admin) ";
+        [Description("")]
         public bool AdminChatEnabled = true;
 
+        [Description("Seconds a player has to wait between pvp toggles.")]
         public int PvpThrottle;
 
+        [Description("Backup frequency in minutes. So, a value of 60 = 60 minutes. Backups are stored in the \\tshock\\backups folder.")]
         public int BackupInterval;
+        [Description("How long backups are kept in minutes. 2880 = 2 days.")]
         public int BackupKeepFor = 60;
 
+        [Description("Remembers where a player left off. It works by remembering the IP, NOT the character.  \neg. When you try to disconnect, and reconnect to be automatically placed at spawn, you'll be at your last location. Note: Won't save after server restarts.")]
         public bool RememberLeavePos;
-
+        [Description("Hardcore players ONLY. This means softcore players cannot join.")]
         public bool HardcoreOnly;
+        [Description("Mediumcore players ONLY. This means softcore players cannot join.")]
         public bool MediumcoreOnly;
+        [Description("Kicks a Hardcore player on death.")]
         public bool KickOnMediumcoreDeath;
+        [Description("Bans a Hardcore player on death.")]
         public bool BanOnMediumcoreDeath;
 
+        [Description("Enable/Disable Terrarias built in auto save")]
         public bool AutoSave = true;
 
+        [Description("Number of failed login attempts before kicking the player.")]
         public int MaximumLoginAttempts = 3;
 
+        [Description("Not implemented")]
         public string RconPassword = "";
+        [Description("Not implemented")]
         public int RconPort = 7777;
+
+        [Description("Not implemented")]
         public string ServerName = "";
+        [Description("Not implemented")]
         public string MasterServer = "127.0.0.1";
 
-        /// <summary>
-        /// Valid types are "sqlite" and "mysql"
-        /// </summary>
+        [Description("Valid types are \"sqlite\" and \"mysql\"")]
         public string StorageType = "sqlite";
 
+        [Description("")]
         public string MySqlHost = "localhost:3306";
+        [Description("")]
         public string MySqlDbName = "";
+        [Description("")]
         public string MySqlUsername = "";
+        [Description("")]
         public string MySqlPassword = "";
-
+        [Description("")]
         public string RangeCheckBanReason = "Placing impossible to place blocks.";
+        [Description("")]
         public string SendSectionAbuseReason = "SendSection abuse.";
+        [Description("")]
         public string NPCSpawnAbuseReason = "Spawn NPC abuse";
+        [Description("")]
         public string UpdatePlayerAbuseReason = "Update Player abuse";
+        [Description("")]
         public string ExplosiveAbuseReason = "Throwing an explosive device.";
+        [Description("")]
         public string KillMeAbuseReason = "Trying to execute KillMe on someone else.";
+        [Description("")]
         public string IllogicalLiquidUseReason = "Manipulating liquid without bucket.";
+        [Description("")]
         public string LiquidAbuseReason = "Placing impossible to place liquid.";
+        [Description("")]
         public string TileKillAbuseReason = "Tile Kill abuse ({0})";
+        [Description("")]
         public string MediumcoreBanReason = "Death results in a ban";
+        [Description("")]
         public string MediumcoreKickReason = "Death results in a kick";
+        [Description("")]
         public string ProjectileAbuseReason = "Projectile abuse";
+        [Description("")]
         public string TileAbuseReason = "Tile abuse ({0})";
-
+        [Description("")]
         public bool EnableDNSHostResolution;
-
+        [Description("")]
         public bool EnableBanOnUsernames;
-
+        [Description("")]
         public bool EnableAntiLag = true;
 
         public string DefaultRegistrationGroupName = "default";
 
+        [Description("")]
         public bool DisableSpewLogs = true;
 
-        /// <summary>
-        /// Valid types are "sha512", "sha256", "md5", append with "-xp" for the xp supported algorithms
-        /// </summary>
+        [Description("Valid types are \"sha512\", \"sha256\", \"md5\", append with \"-xp\" for the xp supported algorithms")]
         public string HashAlgorithm = "sha512";
 
-        /// <summary>
-        /// Buffers up the packets and sends them out at the end of each frame
-        /// </summary>
+        [Description("Buffers up the packets and sends them out at the end of each frame")]
         public bool BufferPackets = true;
 
-        /// <summary>
-        /// Display the users group when they chat.
-        /// </summary>
+        [Description("Display the users group when they chat.")]
         public bool ChatDisplayGroup = false;
 
-        /// <summary>
-        /// String that is used when kicking people when the server is full.
-        /// </summary>
+        [Description("String that is used when kicking people when the server is full.")]
         public string ServerFullReason = "Server is full";
 
+        [Description("This will save the world if Terraria crashes from an unhandled exception.")]
+        public bool SaveWorldOnCrash = true;
+
         public static ConfigFile Read(string path)
         {
             if (!File.Exists(path))
@@ -139,7 +191,7 @@ namespace TShockAPI
 
         public static ConfigFile Read(Stream stream)
         {
-            using(var sr = new StreamReader(stream))
+            using (var sr = new StreamReader(stream))
             {
                 var cf = JsonConvert.DeserializeObject<ConfigFile>(sr.ReadToEnd());
                 if (ConfigRead != null)
@@ -166,5 +218,34 @@ namespace TShockAPI
         }
 
         public static Action<ConfigFile> ConfigRead;
+
+
+        static void DumpDescriptions()
+        {
+            var sb = new StringBuilder();
+            var defaults = new ConfigFile();
+
+            foreach (var field in defaults.GetType().GetFields())
+            {
+                if (field.IsStatic)
+                    continue;
+
+                var name = field.Name;
+                var type = field.FieldType.Name;
+
+                var descattr = field.GetCustomAttributes(false).FirstOrDefault(o => o is DescriptionAttribute) as DescriptionAttribute;
+                var desc = descattr != null && !string.IsNullOrWhiteSpace(descattr.Description) ? descattr.Description : "None";
+
+                var def = field.GetValue(defaults);
+
+                sb.AppendLine("# {0}  ".SFormat(name));
+                sb.AppendLine("**Type:** {0}  ".SFormat(type));
+                sb.AppendLine("**Description:** {0}  ".SFormat(desc));
+                sb.AppendLine("**Default:** \"{0}\"  ".SFormat(def));
+                sb.AppendLine();
+            }
+
+            File.WriteAllText("ConfigDescriptions.txt", sb.ToString());
+        }
     }
 }
\ No newline at end of file