diff --git a/.gitignore b/.gitignore
index 1dd55335..67d693a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ obj/
 NadekoBot/bin/debug/*.*
 NadekoBot/bin/debug/data/permissions
 NadekoBot/bin/debug/data/incidents
+NadekoBot/bin/debug/data/musicdata
 NadekoBot/bin/NadekoRelease/*.*
 !NadekoBot/bin/Debug/data/currency_images/*
 Tests/bin
diff --git a/DockerGuide.md b/DockerGuide.md
new file mode 100644
index 00000000..b079c6f3
--- /dev/null
+++ b/DockerGuide.md
@@ -0,0 +1,47 @@
+## Docker guide with digitalocean
+
+#####Prerequisites:
+- Digital ocean account (you can use my reflink to support the project and get 10$ after you register http://m.do.co/c/46b4d3d44795/ )
+- Putty (get it here http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html)
+- A bot account - (follow http://discord.kongslien.net/guide.html)
+- Common sense
+
+Click on the create droplet button
+![img](http://i.imgur.com/g2ayOcC.png)
+
+pick one click apps and select docker on 14.04 
+
+![img](http://imgur.com/065Xkme.png)
+
+- pick any droplet size you want (5$ will work ok-ish on a few servers)
+- pick location closest to your discord server's location
+- Pick a hostname  
+![img](http://imgur.com/ifPKB6p.png)
+
+- click create 
+
+You will get an email from digitalocean with your creds now.
+
+Open putty and type ip adress **you got in your email** with port 22  
+
+![img](http://imgur.com/Mh5ehsh.png)
+
+console will open and you will be prompted for a username, type `root`  
+type in the password you got in the email  
+confirm the password you just typed in  
+type in the new password  
+confirm new password  
+
+when you are successfully logged in, type   
+`docker run --name nadeko -v /nadeko:/config uirel/nadeko`
+
+wait for it to download and at one point it is going to start throwing errors due to credentials.json being empty  
+CTRL+C to exit that  
+type `docker stop nadeko`  
+type `nano /nadeko/credentials.json` and type in your credentials  
+CTRL+X then CTRL+Y to save  
+type `docker start nadeko`  
+
+Your bot is running, enjoy
+
+*When you want to update the bot, just type `docker restart nadeko` as it always downloads latest prerelease*
diff --git a/NadekoBot/Classes/DBHandler.cs b/NadekoBot/Classes/DBHandler.cs
index 3f2963cc..db8dee81 100644
--- a/NadekoBot/Classes/DBHandler.cs
+++ b/NadekoBot/Classes/DBHandler.cs
@@ -13,129 +13,74 @@ namespace NadekoBot.Classes
 
         private string FilePath { get; } = "data/nadekobot.sqlite";
 
+        public SQLiteConnection Connection { get; set; }
+
         static DbHandler() { }
         public DbHandler()
         {
-            using (var conn = new SQLiteConnection(FilePath))
+            Connection = new SQLiteConnection(FilePath);
+            Connection.CreateTable<Stats>();
+            Connection.CreateTable<Command>();
+            Connection.CreateTable<Announcement>();
+            Connection.CreateTable<Request>();
+            Connection.CreateTable<TypingArticle>();
+            Connection.CreateTable<CurrencyState>();
+            Connection.CreateTable<CurrencyTransaction>();
+            Connection.CreateTable<Donator>();
+            Connection.CreateTable<UserPokeTypes>();
+            Connection.CreateTable<UserQuote>();
+            Connection.CreateTable<Reminder>();
+            Connection.CreateTable<SongInfo>();
+            Connection.CreateTable<PlaylistSongInfo>();
+            Connection.CreateTable<MusicPlaylist>();
+            Connection.CreateTable<Incident>();
+            Connection.Execute(Queries.TransactionTriggerQuery);
+            try
             {
-                conn.CreateTable<Stats>();
-                conn.CreateTable<Command>();
-                conn.CreateTable<Announcement>();
-                conn.CreateTable<Request>();
-                conn.CreateTable<TypingArticle>();
-                conn.CreateTable<CurrencyState>();
-                conn.CreateTable<CurrencyTransaction>();
-                conn.CreateTable<Donator>();
-                conn.CreateTable<UserPokeTypes>();
-                conn.CreateTable<UserQuote>();
-                conn.CreateTable<Reminder>();
-                conn.CreateTable<SongInfo>();
-                conn.CreateTable<PlaylistSongInfo>();
-                conn.CreateTable<MusicPlaylist>();
-                conn.CreateTable<Incident>();
-                conn.Execute(Queries.TransactionTriggerQuery);
-                try
-                {
-                    conn.Execute(Queries.DeletePlaylistTriggerQuery);
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine(ex);
-                }
+                Connection.Execute(Queries.DeletePlaylistTriggerQuery);
+            }
+            catch (Exception ex)
+            {
+                Console.WriteLine(ex);
             }
         }
 
         internal T FindOne<T>(Expression<Func<T, bool>> p) where T : IDataModel, new()
         {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                return conn.Table<T>().Where(p).FirstOrDefault();
-            }
+            return Connection.Table<T>().Where(p).FirstOrDefault();
+
         }
 
         internal IList<T> FindAll<T>(Expression<Func<T, bool>> p) where T : IDataModel, new()
         {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                return conn.Table<T>().Where(p).ToList();
-            }
-        }
 
-        internal void DeleteAll<T>() where T : IDataModel
-        {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                conn.DeleteAll<T>();
-            }
+            return Connection.Table<T>().Where(p).ToList();
+
         }
 
         internal void DeleteWhere<T>(Expression<Func<T, bool>> p) where T : IDataModel, new()
         {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                var id = conn.Table<T>().Where(p).FirstOrDefault()?.Id;
-                if (id.HasValue)
-                    conn.Delete<T>(id);
-            }
-        }
-
-        internal void InsertData<T>(T o) where T : IDataModel
-        {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                conn.Insert(o, typeof(T));
-            }
-        }
-
-        internal void InsertMany<T>(T objects) where T : IEnumerable<IDataModel>
-        {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                conn.InsertAll(objects);
-            }
-        }
-
-        internal void UpdateData<T>(T o) where T : IDataModel
-        {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                conn.Update(o, typeof(T));
-            }
-        }
-
-        internal void UpdateAll<T>(IEnumerable<T> objs) where T : IDataModel
-        {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                conn.UpdateAll(objs);
-            }
+            var id = Connection.Table<T>().Where(p).FirstOrDefault()?.Id;
+            if (id.HasValue)
+                Connection.Delete<T>(id);
         }
 
         internal HashSet<T> GetAllRows<T>() where T : IDataModel, new()
         {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                return new HashSet<T>(conn.Table<T>());
-            }
+            return new HashSet<T>(Connection.Table<T>());
         }
 
         internal CurrencyState GetStateByUserId(long id)
         {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                return conn.Table<CurrencyState>().Where(x => x.UserId == id).FirstOrDefault();
-            }
+            return Connection.Table<CurrencyState>().Where(x => x.UserId == id).FirstOrDefault();
         }
 
         internal T Delete<T>(int id) where T : IDataModel, new()
         {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                var found = conn.Find<T>(id);
-                if (found != null)
-                    conn.Delete<T>(found.Id);
-                return found;
-            }
+            var found = Connection.Find<T>(id);
+            if (found != null)
+                Connection.Delete<T>(found.Id);
+            return found;
         }
 
         /// <summary>
@@ -143,14 +88,11 @@ namespace NadekoBot.Classes
         /// </summary>
         internal void Save<T>(T o) where T : IDataModel, new()
         {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                var found = conn.Find<T>(o.Id);
-                if (found == null)
-                    conn.Insert(o, typeof(T));
-                else
-                    conn.Update(o, typeof(T));
-            }
+            var found = Connection.Find<T>(o.Id);
+            if (found == null)
+                Connection.Insert(o, typeof(T));
+            else
+                Connection.Update(o, typeof(T));
         }
 
         /// <summary>
@@ -158,20 +100,14 @@ namespace NadekoBot.Classes
         /// </summary>
         internal void SaveAll<T>(IEnumerable<T> ocol) where T : IDataModel, new()
         {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                foreach (var o in ocol)
-                    conn.InsertOrReplace(o);
-            }
+            foreach (var o in ocol)
+                Connection.InsertOrReplace(o);
         }
 
         internal T GetRandom<T>(Expression<Func<T, bool>> p) where T : IDataModel, new()
         {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                var r = new Random();
-                return conn.Table<T>().Where(p).ToList().OrderBy(x => r.Next()).FirstOrDefault();
-            }
+            var r = new Random();
+            return Connection.Table<T>().Where(p).ToList().OrderBy(x => r.Next()).FirstOrDefault();
         }
         /// <summary>
         /// 
@@ -180,24 +116,19 @@ namespace NadekoBot.Classes
         /// <returns></returns>
         internal List<PlaylistData> GetPlaylistData(int num)
         {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                return conn.Query<PlaylistData>(
+            return Connection.Query<PlaylistData>(
 @"SELECT mp.Name as 'Name',mp.Id as 'Id', mp.CreatorName as 'Creator', Count(*) as 'SongCnt' FROM MusicPlaylist as mp
 INNER JOIN PlaylistSongInfo as psi
 ON mp.Id = psi.PlaylistId
 Group BY mp.Name
 Order By mp.DateAdded desc
 Limit 20 OFFSET ?", num * 20);
-            }
+
         }
 
         internal IEnumerable<CurrencyState> GetTopRichest(int n = 10)
         {
-            using (var conn = new SQLiteConnection(FilePath))
-            {
-                return conn.Table<CurrencyState>().OrderByDescending(cs => cs.Value).Take(n).ToList();
-            }
+            return Connection.Table<CurrencyState>().OrderByDescending(cs => cs.Value).Take(n).ToList();
         }
     }
 }
diff --git a/NadekoBot/Classes/FlowersHandler.cs b/NadekoBot/Classes/FlowersHandler.cs
index 6fa042ea..57191c63 100644
--- a/NadekoBot/Classes/FlowersHandler.cs
+++ b/NadekoBot/Classes/FlowersHandler.cs
@@ -10,7 +10,7 @@ namespace NadekoBot.Classes
                 return;
             await Task.Run(() =>
             {
-                DbHandler.Instance.InsertData(new DataModels.CurrencyTransaction
+                DbHandler.Instance.Connection.Insert(new DataModels.CurrencyTransaction
                 {
                     Reason = reason,
                     UserId = (long)u.Id,
@@ -36,7 +36,7 @@ namespace NadekoBot.Classes
             if (state.Value < amount)
                 return false;
 
-            DbHandler.Instance.InsertData(new DataModels.CurrencyTransaction
+            DbHandler.Instance.Connection.Insert(new DataModels.CurrencyTransaction
             {
                 Reason = reason,
                 UserId = (long)u.Id,
diff --git a/NadekoBot/Classes/IncidentsHandler.cs b/NadekoBot/Classes/IncidentsHandler.cs
index 5d8190fe..3042f824 100644
--- a/NadekoBot/Classes/IncidentsHandler.cs
+++ b/NadekoBot/Classes/IncidentsHandler.cs
@@ -19,7 +19,7 @@ namespace NadekoBot.Classes
                 Read = false
             };
 
-            DbHandler.Instance.InsertData<Incident>(incident);
+            DbHandler.Instance.Connection.Insert(incident, typeof(Incident));
         }
     }
 }
diff --git a/NadekoBot/Classes/NadekoStats.cs b/NadekoBot/Classes/NadekoStats.cs
index 3ccbc272..8161348a 100644
--- a/NadekoBot/Classes/NadekoStats.cs
+++ b/NadekoBot/Classes/NadekoStats.cs
@@ -46,20 +46,7 @@ namespace NadekoBot
 
             commandService.CommandExecuted += StatsCollector_RanCommand;
             commandService.CommandFinished += CommandService_CommandFinished;
-            commandService.CommandErrored += (s, e) =>
-            {
-                try
-                {
-                    if (e.ErrorType == CommandErrorType.Exception)
-                        File.AppendAllText("errors.txt", $@"Command: {e.Command}
-{e.Exception}
--------------------------------------
-");
-                }
-                catch {
-                    Console.WriteLine("Command errored errorring");
-                }
-            };
+            commandService.CommandErrored += CommandService_CommandFinished;
 
             Task.Run(StartCollecting);
 
@@ -208,7 +195,7 @@ namespace NadekoBot
                                                                         .ConfigureAwait(false);
                     var connectedServers = NadekoBot.Client.Servers.Count();
 
-                    Classes.DbHandler.Instance.InsertData(new DataModels.Stats
+                    Classes.DbHandler.Instance.Connection.Insert(new DataModels.Stats
                     {
                         OnlineUsers = onlineUsers,
                         RealOnlineUsers = realOnlineUsers,
@@ -236,10 +223,31 @@ namespace NadekoBot
 
         private void CommandService_CommandFinished(object sender, CommandEventArgs e)
         {
+
             DateTime dt;
             if (!commandTracker.TryGetValue(e.Message.Id, out dt))
                 return;
-            Console.WriteLine($">>COMMAND ENDED after *{(DateTime.UtcNow - dt).TotalSeconds}s*\nCmd: {e.Command.Text}\nMsg: {e.Message.Text}\nUsr: {e.User.Name} [{e.User.Id}]\nSrvr: {e.Server?.Name ?? "PRIVATE"} [{e.Server?.Id}]\n-----");
+            try
+            {
+                if (e is CommandErrorEventArgs)
+                {
+                    var er = e as CommandErrorEventArgs;
+                    if (er.ErrorType == CommandErrorType.Exception)
+                    {
+                        File.AppendAllText("errors.txt", $@"Command: {er.Command}
+{er.Exception}
+-------------------------------------
+");
+                        Console.WriteLine($">>COMMAND ERRORED after *{(DateTime.UtcNow - dt).TotalSeconds}s*\nCmd: {e.Command.Text}\nMsg: {e.Message.Text}\nUsr: {e.User.Name} [{e.User.Id}]\nSrvr: {e.Server?.Name ?? "PRIVATE"} [{e.Server?.Id}]\n-----");
+                    }
+
+                }
+                else
+                {
+                    Console.WriteLine($">>COMMAND ENDED after *{(DateTime.UtcNow - dt).TotalSeconds}s*\nCmd: {e.Command.Text}\nMsg: {e.Message.Text}\nUsr: {e.User.Name} [{e.User.Id}]\nSrvr: {e.Server?.Name ?? "PRIVATE"} [{e.Server?.Id}]\n-----");
+                }
+            }
+            catch { }
         }
 
         private async void StatsCollector_RanCommand(object sender, CommandEventArgs e)
@@ -252,7 +260,7 @@ namespace NadekoBot
                 try
                 {
                     commandsRan++;
-                    Classes.DbHandler.Instance.InsertData(new DataModels.Command
+                    Classes.DbHandler.Instance.Connection.Insert(new DataModels.Command
                     {
                         ServerId = (long)(e.Server?.Id ?? 0),
                         ServerName = e.Server?.Name ?? "--Direct Message--",
diff --git a/NadekoBot/Classes/SearchHelper.cs b/NadekoBot/Classes/SearchHelper.cs
index 7f26e1da..a0a59e9b 100644
--- a/NadekoBot/Classes/SearchHelper.cs
+++ b/NadekoBot/Classes/SearchHelper.cs
@@ -25,16 +25,13 @@ namespace NadekoBot.Classes
     {
         private static DateTime lastRefreshed = DateTime.MinValue;
         private static string token { get; set; } = "";
-        private static readonly HttpClient httpClient = new HttpClient();
 
         public static async Task<Stream> GetResponseStreamAsync(string url,
             IEnumerable<KeyValuePair<string, string>> headers = null, RequestHttpMethod method = RequestHttpMethod.Get)
         {
             if (string.IsNullOrWhiteSpace(url))
                 throw new ArgumentNullException(nameof(url));
-            //if its a post or there are no headers, use static httpclient
-            // if there are headers and it's get, it's not threadsafe
-            var cl = headers == null || method == RequestHttpMethod.Post ? httpClient : new HttpClient();
+            var cl = new HttpClient();
             cl.DefaultRequestHeaders.Clear();
             switch (method)
             {
@@ -178,7 +175,7 @@ namespace NadekoBot.Classes
                 return null;
         }
 
-        public static async Task<string> GetRelatedVideoId(string id)
+        public static async Task<IEnumerable<string>> GetRelatedVideoIds(string id, int count = 1)
         {
             if (string.IsNullOrWhiteSpace(id))
                 throw new ArgumentNullException(nameof(id));
@@ -189,20 +186,14 @@ namespace NadekoBot.Classes
             }
             var response = await GetResponseStringAsync(
                                     $"https://www.googleapis.com/youtube/v3/search?" +
-                                    $"part=snippet&maxResults=1&type=video" +
+                                    $"part=snippet&maxResults={count}&type=video" +
                                     $"&relatedToVideoId={id}" +
                                     $"&key={NadekoBot.Creds.GoogleAPIKey}").ConfigureAwait(false);
             JObject obj = JObject.Parse(response);
 
             var data = JsonConvert.DeserializeObject<YoutubeVideoSearch>(response);
 
-            if (data.items.Length > 0)
-            {
-                var toReturn = "http://www.youtube.com/watch?v=" + data.items[0].id.videoId.ToString();
-                return toReturn;
-            }
-            else
-                return null;
+            return data.items.Select(v => "http://www.youtube.com/watch?v=" + v.id.videoId);
         }
 
         public static async Task<string> GetPlaylistIdByKeyword(string query)
diff --git a/NadekoBot/Modules/Administration/AdministrationModule.cs b/NadekoBot/Modules/Administration/AdministrationModule.cs
index 036687aa..670d2513 100644
--- a/NadekoBot/Modules/Administration/AdministrationModule.cs
+++ b/NadekoBot/Modules/Administration/AdministrationModule.cs
@@ -64,7 +64,7 @@ namespace NadekoBot.Modules.Administration
                 commands.ForEach(cmd => cmd.Init(cgb));
 
                 cgb.CreateCommand(Prefix + "delmsgoncmd")
-                    .Description("Toggles the automatic deletion of user's successful command message to prevent chat flood. Server Manager Only.")
+                    .Description($"Toggles the automatic deletion of user's successful command message to prevent chat flood. Server Manager Only. | `{Prefix}delmsgoncmd`")
                     .AddCheck(SimpleCheckers.ManageServer())
                     .Do(async e =>
                     {
@@ -79,7 +79,7 @@ namespace NadekoBot.Modules.Administration
                     });
 
                 cgb.CreateCommand(Prefix + "restart")
-                    .Description("Restarts the bot. Might not work. **Bot Owner Only**")
+                    .Description($"Restarts the bot. Might not work. **Bot Owner Only** | `{Prefix}restart`")
                     .AddCheck(SimpleCheckers.OwnerOnly())
                     .Do(async e =>
                     {
@@ -406,7 +406,7 @@ namespace NadekoBot.Modules.Administration
                     {
                         if (!e.User.ServerPermissions.MuteMembers)
                         {
-                            await e.Channel.SendMessage("You do not have permission to do that.").ConfigureAwait(false);
+                            await e.Channel.SendMessage("I most likely don't have the permission necessary for that.").ConfigureAwait(false);
                             return;
                         }
                         if (!e.Message.MentionedUsers.Any())
@@ -421,7 +421,7 @@ namespace NadekoBot.Modules.Administration
                         }
                         catch
                         {
-                            await e.Channel.SendMessage("I do not have permission to do that most likely.").ConfigureAwait(false);
+                            await e.Channel.SendMessage("I most likely don't have the permission necessary for that.").ConfigureAwait(false);
                         }
                     });
 
@@ -447,7 +447,7 @@ namespace NadekoBot.Modules.Administration
                         }
                         catch
                         {
-                            await e.Channel.SendMessage("I do not have permission to do that most likely.").ConfigureAwait(false);
+                            await e.Channel.SendMessage("I most likely don't have the permission necessary for that.").ConfigureAwait(false);
                         }
                     });
 
@@ -474,7 +474,7 @@ namespace NadekoBot.Modules.Administration
                         }
                         catch
                         {
-                            await e.Channel.SendMessage("I do not have permission to do that most likely.").ConfigureAwait(false);
+                            await e.Channel.SendMessage("I most likely don't have the permission necessary for that.").ConfigureAwait(false);
                         }
                     });
 
@@ -501,7 +501,7 @@ namespace NadekoBot.Modules.Administration
                         }
                         catch
                         {
-                            await e.Channel.SendMessage("I do not have permission to do that most likely.").ConfigureAwait(false);
+                            await e.Channel.SendMessage("I most likely don't have the permission necessary for that.").ConfigureAwait(false);
                         }
                     });
 
@@ -617,7 +617,7 @@ namespace NadekoBot.Modules.Administration
                     });
 
                 cgb.CreateCommand(Prefix + "heap")
-                  .Description("Shows allocated memory - **Bot Owner Only!**")
+                  .Description($"Shows allocated memory - **Bot Owner Only!** | `{Prefix}heap`")
                   .AddCheck(SimpleCheckers.OwnerOnly())
                   .Do(async e =>
                   {
@@ -628,19 +628,19 @@ namespace NadekoBot.Modules.Administration
                 cgb.CreateCommand(Prefix + "prune")
                     .Alias(Prefix + "clr")
                     .Description(
-    "`.prune` removes all nadeko's messages in the last 100 messages.`.prune X` removes last X messages from the channel (up to 100)`.prune @Someone` removes all Someone's messages in the last 100 messages.`.prune @Someone X` removes last X 'Someone's' messages in the channel. | `.prune` or `.prune 5` or `.prune @Someone` or `.prune @Someone X`")
+                    "`.prune` removes all nadeko's messages in the last 100 messages.`.prune X` removes last X messages from the channel (up to 100)`.prune @Someone` removes all Someone's messages in the last 100 messages.`.prune @Someone X` removes last X 'Someone's' messages in the channel. " +
+                    $"| `{Prefix}prune` or `{Prefix}prune 5` or `{Prefix}prune @Someone` or `{Prefix}prune @Someone X`")
                     .Parameter("user_or_num", ParameterType.Optional)
                     .Parameter("num", ParameterType.Optional)
                     .Do(async e =>
                     {
-                        Message[] msgs;
                         if (string.IsNullOrWhiteSpace(e.GetArg("user_or_num"))) // if nothing is set, clear nadeko's messages, no permissions required
                         {
-                            msgs = (await e.Channel.DownloadMessages(100).ConfigureAwait(false));//.Where(m => m.User.Id == e.Server.CurrentUser.Id).ToArray();
-                            msgs = msgs.Where(m => m.User.Id == e.Server.CurrentUser.Id).ToArray();
-                            if (!msgs.Any())
+                            var msgs = (await e.Channel.DownloadMessages(100).ConfigureAwait(false)).Where(m => m.User?.Id == e.Server.CurrentUser.Id)?.ToArray();
+                            if (msgs == null || !msgs.Any())
                                 return;
-                            await e.Channel.DeleteMessages(msgs).ConfigureAwait(false);
+                            var toDelete = msgs as Message[] ?? msgs.ToArray();
+                            await e.Channel.DeleteMessages(toDelete).ConfigureAwait(false);
                             return;
                         }
                         if (!e.User.GetPermissions(e.Channel).ManageMessages)
@@ -667,14 +667,14 @@ namespace NadekoBot.Modules.Administration
                         val = 100;
                         if (!int.TryParse(e.GetArg("num"), out val))
                             val = 100;
-                        msgs = (await e.Channel.DownloadMessages(100).ConfigureAwait(false)).Where(m => m.User.Id == usr.Id).Take(val).ToArray();
-                        if (!msgs.Any())
+                        var mesgs = (await e.Channel.DownloadMessages(100).ConfigureAwait(false)).Where(m => m.User?.Id == usr.Id).Take(val);
+                        if (mesgs == null || !mesgs.Any())
                             return;
-                        await e.Channel.DeleteMessages(msgs).ConfigureAwait(false);
+                        await e.Channel.DeleteMessages(mesgs as Message[] ?? mesgs.ToArray()).ConfigureAwait(false);
                     });
 
                 cgb.CreateCommand(Prefix + "die")
-                    .Description("Shuts the bot down and notifies users about the restart. **Bot Owner Only!**")
+                    .Description($"Shuts the bot down and notifies users about the restart. **Bot Owner Only!** | `{Prefix}die`")
                     .AddCheck(SimpleCheckers.OwnerOnly())
                     .Do(async e =>
                     {
@@ -807,7 +807,7 @@ namespace NadekoBot.Modules.Administration
                     });
 
                 cgb.CreateCommand(Prefix + "unstuck")
-                  .Description("Clears the message queue. **Bot Owner Only!**")
+                  .Description($"Clears the message queue. **Bot Owner Only!** | `{Prefix}unstuck`")
                   .AddCheck(SimpleCheckers.OwnerOnly())
                   .Do(e =>
                   {
@@ -829,7 +829,7 @@ namespace NadekoBot.Modules.Administration
                     });
 
                 cgb.CreateCommand(Prefix + "donadd")
-                    .Description($"Add a donator to the database. | `.donadd Donate Amount`")
+                    .Description($"Add a donator to the database. | `{Prefix}donadd Donate Amount`")
                     .Parameter("donator")
                     .Parameter("amount")
                     .AddCheck(SimpleCheckers.OwnerOnly())
@@ -842,7 +842,7 @@ namespace NadekoBot.Modules.Administration
                             if (donator == null) return;
                             try
                             {
-                                DbHandler.Instance.InsertData(new Donator
+                                DbHandler.Instance.Connection.Insert(new Donator
                                 {
                                     Amount = amount,
                                     UserName = donator.Name,
diff --git a/NadekoBot/Modules/Administration/Commands/AutoAssignRole.cs b/NadekoBot/Modules/Administration/Commands/AutoAssignRole.cs
index c368aa0b..7ccd0e0e 100644
--- a/NadekoBot/Modules/Administration/Commands/AutoAssignRole.cs
+++ b/NadekoBot/Modules/Administration/Commands/AutoAssignRole.cs
@@ -34,7 +34,7 @@ namespace NadekoBot.Modules.Administration.Commands
         {
             cgb.CreateCommand(Module.Prefix + "autoassignrole")
                 .Alias(Module.Prefix + "aar")
-                .Description($"Automaticaly assigns a specified role to every user who joins the server. Type `.aar` to disable, `.aar Role Name` to enable")
+                .Description($"Automaticaly assigns a specified role to every user who joins the server. |`{Prefix}aar` to disable, `{Prefix}aar Role Name` to enable")
                 .Parameter("role", ParameterType.Unparsed)
                 .AddCheck(new SimpleCheckers.ManageRoles())
                 .Do(async e =>
diff --git a/NadekoBot/Modules/Administration/Commands/CrossServerTextChannel.cs b/NadekoBot/Modules/Administration/Commands/CrossServerTextChannel.cs
index 0d2a3fe7..f8dc2133 100644
--- a/NadekoBot/Modules/Administration/Commands/CrossServerTextChannel.cs
+++ b/NadekoBot/Modules/Administration/Commands/CrossServerTextChannel.cs
@@ -64,8 +64,8 @@ namespace NadekoBot.Modules.Administration.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "scsc")
-                .Description("Starts an instance of cross server channel. You will get a token as a DM" +
-                             "that other people will use to tune in to the same instance")
+                .Description("Starts an instance of cross server channel. You will get a token as a DM " +
+                             $"that other people will use to tune in to the same instance. | `{Prefix}scsc`")
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(async e =>
                 {
@@ -79,7 +79,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "jcsc")
-                .Description("Joins current channel to an instance of cross server channel using the token.")
+                .Description($"Joins current channel to an instance of cross server channel using the token. | `{Prefix}jcsc`")
                 .Parameter("token")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(async e =>
@@ -95,7 +95,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "lcsc")
-                .Description("Leaves Cross server channel instance from this channel")
+                .Description($"Leaves Cross server channel instance from this channel. | `{Prefix}lcsc`")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(async e =>
                 {
diff --git a/NadekoBot/Modules/Administration/Commands/CustomReactionsCommands.cs b/NadekoBot/Modules/Administration/Commands/CustomReactionsCommands.cs
index a01f9a8d..5105863f 100644
--- a/NadekoBot/Modules/Administration/Commands/CustomReactionsCommands.cs
+++ b/NadekoBot/Modules/Administration/Commands/CustomReactionsCommands.cs
@@ -23,7 +23,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Prefix + "addcustreact")
                 .Alias(Prefix + "acr")
-                .Description($"Add a custom reaction. Guide here: <https://github.com/Kwoth/NadekoBot/wiki/Custom-Reactions> **Bot Owner Only!**   | {Prefix}acr \"hello\" I love saying hello to %user%")
+                .Description($"Add a custom reaction. Guide here: <https://github.com/Kwoth/NadekoBot/wiki/Custom-Reactions> **Bot Owner Only!**   | `{Prefix}acr \"hello\" I love saying hello to %user%`")
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Parameter("name", ParameterType.Required)
                 .Parameter("message", ParameterType.Unparsed)
@@ -47,7 +47,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Prefix + "listcustreact")
                 .Alias(Prefix + "lcr")
-                .Description($"Lists custom reactions (paginated with 30 commands per page). Use 'all' instead of page number to get all custom reactions DM-ed to you.  |{Prefix}lcr 1")
+                .Description($"Lists custom reactions (paginated with 30 commands per page). Use 'all' instead of page number to get all custom reactions DM-ed to you.  |`{Prefix}lcr 1`")
                 .Parameter("num", ParameterType.Required)
                 .Do(async e =>
                 {
@@ -80,7 +80,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Prefix + "showcustreact")
                 .Alias(Prefix + "scr")
-                .Description($"Shows all possible responses from a single custom reaction. |{Prefix}scr %mention% bb")
+                .Description($"Shows all possible responses from a single custom reaction. |`{Prefix}scr %mention% bb`")
                 .Parameter("name", ParameterType.Unparsed)
                 .Do(async e =>
                 {
@@ -106,7 +106,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Prefix + "editcustreact")
                 .Alias(Prefix + "ecr")
-                .Description("Edits a custom reaction, arguments are custom reactions name, index to change, and a (multiword) message **Bot Owner Only** | `.ecr \"%mention% disguise\" 2 Test 123`")
+                .Description($"Edits a custom reaction, arguments are custom reactions name, index to change, and a (multiword) message **Bot Owner Only** | `{Prefix}ecr \"%mention% disguise\" 2 Test 123`")
                 .Parameter("name", ParameterType.Required)
                 .Parameter("index", ParameterType.Required)
                 .Parameter("message", ParameterType.Unparsed)
@@ -146,7 +146,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Prefix + "delcustreact")
                 .Alias(Prefix + "dcr")
-                .Description("Deletes a custom reaction with given name (and index)")
+                .Description($"Deletes a custom reaction with given name (and index). | `{Prefix}dcr index`")
                 .Parameter("name", ParameterType.Required)
                 .Parameter("index", ParameterType.Optional)
                 .AddCheck(SimpleCheckers.OwnerOnly())
diff --git a/NadekoBot/Modules/Administration/Commands/IncidentsCommands.cs b/NadekoBot/Modules/Administration/Commands/IncidentsCommands.cs
index a5854708..d7915bb2 100644
--- a/NadekoBot/Modules/Administration/Commands/IncidentsCommands.cs
+++ b/NadekoBot/Modules/Administration/Commands/IncidentsCommands.cs
@@ -14,26 +14,26 @@ namespace NadekoBot.Modules.Administration.Commands
         {
             cgb.CreateCommand(Module.Prefix + "listincidents")
                 .Alias(Prefix + "lin")
-                .Description("List all UNREAD incidents and flags them as read.")
+                .Description($"List all UNREAD incidents and flags them as read. | `{Prefix}lin`")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(async e =>
                 {
                     var sid = (long)e.Server.Id;
                     var incs = DbHandler.Instance.FindAll<Incident>(i => i.ServerId == sid && i.Read == false);
-                    DbHandler.Instance.UpdateAll<Incident>(incs.Select(i => { i.Read = true; return i; }));
+                    DbHandler.Instance.Connection.UpdateAll(incs.Select(i => { i.Read = true; return i; }));
 
                     await e.User.SendMessage(string.Join("\n----------------------", incs.Select(i => i.Text)));
                 });
 
             cgb.CreateCommand(Module.Prefix + "listallincidents")
                 .Alias(Prefix + "lain")
-                .Description("Sends you a file containing all incidents and flags them as read.")
+                .Description($"Sends you a file containing all incidents and flags them as read. | `{Prefix}lain`")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(async e =>
                 {
                     var sid = (long)e.Server.Id;
                     var incs = DbHandler.Instance.FindAll<Incident>(i => i.ServerId == sid);
-                    DbHandler.Instance.UpdateAll<Incident>(incs.Select(i => { i.Read = true; return i; }));
+                    DbHandler.Instance.Connection.UpdateAll(incs.Select(i => { i.Read = true; return i; }));
                     var data = string.Join("\n----------------------\n", incs.Select(i => i.Text));
                     MemoryStream ms = new MemoryStream();
                     var sw = new StreamWriter(ms);
diff --git a/NadekoBot/Modules/Administration/Commands/LogCommand.cs b/NadekoBot/Modules/Administration/Commands/LogCommand.cs
index 3bbce6d2..db693ae3 100644
--- a/NadekoBot/Modules/Administration/Commands/LogCommand.cs
+++ b/NadekoBot/Modules/Administration/Commands/LogCommand.cs
@@ -4,7 +4,10 @@ using NadekoBot.Classes;
 using NadekoBot.Extensions;
 using NadekoBot.Modules.Permissions.Classes;
 using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.Administration.Commands
 {
@@ -12,6 +15,8 @@ namespace NadekoBot.Modules.Administration.Commands
     {
         private string prettyCurrentTime => $"【{DateTime.Now:HH:mm:ss}】";
 
+        private ConcurrentBag<KeyValuePair<Channel, string>> voicePresenceUpdates = new ConcurrentBag<KeyValuePair<Channel, string>>();
+
         public LogCommand(DiscordModule module) : base(module)
         {
             NadekoBot.Client.MessageReceived += MsgRecivd;
@@ -45,6 +50,36 @@ namespace NadekoBot.Modules.Administration.Commands
                 }
                 catch { }
             };
+
+            // start the userpresence queue
+
+            NadekoBot.OnReady += () => Task.Run(async () =>
+             {
+                 while (true)
+                 {
+                     var toSend = new Dictionary<Channel, string>();
+                     //take everything from the queue and merge the messages which are going to the same channel
+                     KeyValuePair<Channel, string> item;
+                     while (voicePresenceUpdates.TryTake(out item))
+                     {
+                         if (toSend.ContainsKey(item.Key))
+                         {
+                             toSend[item.Key] = toSend[item.Key] + Environment.NewLine + item.Value;
+                         }
+                         else
+                         {
+                             toSend.Add(item.Key, item.Value);
+                         }
+                     }
+                     //send merged messages to each channel
+                     foreach (var k in toSend)
+                     {
+                         try { await k.Key.SendMessage(Environment.NewLine + k.Value).ConfigureAwait(false); } catch { }
+                     }
+
+                     await Task.Delay(5000);
+                 }
+             });
         }
 
         private async void ChannelUpdated(object sender, ChannelUpdatedEventArgs e)
@@ -177,13 +212,13 @@ namespace NadekoBot.Modules.Administration.Commands
                 if (!string.IsNullOrWhiteSpace(e.Message.Text))
                 {
                     await ch.SendMessage(
-    $@"🕔`{prettyCurrentTime}` **New Message** `#{e.Channel.Name}`
+        $@"🕔`{prettyCurrentTime}` **New Message** `#{e.Channel.Name}`
 👤`{e.User?.ToString() ?? ("NULL")}` {e.Message.Text.Unmention()}").ConfigureAwait(false);
                 }
                 else
                 {
                     await ch.SendMessage(
-    $@"🕔`{prettyCurrentTime}` **File Uploaded** `#{e.Channel.Name}`
+        $@"🕔`{prettyCurrentTime}` **File Uploaded** `#{e.Channel.Name}`
 👤`{e.User?.ToString() ?? ("NULL")}` {e.Message.Attachments.FirstOrDefault()?.ProxyUrl}").ConfigureAwait(false);
                 }
 
@@ -206,13 +241,13 @@ namespace NadekoBot.Modules.Administration.Commands
                 if (!string.IsNullOrWhiteSpace(e.Message.Text))
                 {
                     await ch.SendMessage(
-    $@"🕔`{prettyCurrentTime}` **Message** 🚮 `#{e.Channel.Name}`
+        $@"🕔`{prettyCurrentTime}` **Message** 🚮 `#{e.Channel.Name}`
 👤`{e.User?.ToString() ?? ("NULL")}` {e.Message.Text.Unmention()}").ConfigureAwait(false);
                 }
                 else
                 {
                     await ch.SendMessage(
-    $@"🕔`{prettyCurrentTime}` **File Deleted** `#{e.Channel.Name}`
+        $@"🕔`{prettyCurrentTime}` **File Deleted** `#{e.Channel.Name}`
 👤`{e.User?.ToString() ?? ("NULL")}` {e.Message.Attachments.FirstOrDefault()?.ProxyUrl}").ConfigureAwait(false);
                 }
             }
@@ -232,7 +267,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 if ((ch = e.Server.TextChannels.Where(tc => tc.Id == chId).FirstOrDefault()) == null)
                     return;
                 await ch.SendMessage(
-$@"🕔`{prettyCurrentTime}` **Message** 📝 `#{e.Channel.Name}`
+        $@"🕔`{prettyCurrentTime}` **Message** 📝 `#{e.Channel.Name}`
 👤`{e.User?.ToString() ?? ("NULL")}`
         `Old:` {e.Before.Text.Unmention()}
         `New:` {e.After.Text.Unmention()}").ConfigureAwait(false);
@@ -252,7 +287,7 @@ $@"🕔`{prettyCurrentTime}` **Message** 📝 `#{e.Channel.Name}`
                     {
                         if (e.Before.Status != e.After.Status)
                         {
-                            await ch.SendMessage($"`{prettyCurrentTime}`**{e.Before.Name}** is now **{e.After.Status}**.").ConfigureAwait(false);
+                            voicePresenceUpdates.Add(new KeyValuePair<Channel, string>(ch, $"`{prettyCurrentTime}`**{e.Before.Name}** is now **{e.After.Status}**."));
                         }
                     }
                 }
@@ -340,7 +375,7 @@ $@"🕔`{prettyCurrentTime}` **Message** 📝 `#{e.Channel.Name}`
         {
 
             cgb.CreateCommand(Module.Prefix + "spmom")
-                .Description("Toggles whether mentions of other offline users on your server will send a pm to them.")
+                .Description($"Toggles whether mentions of other offline users on your server will send a pm to them. | `{Prefix}spmom`")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(async e =>
                 {
@@ -356,7 +391,7 @@ $@"🕔`{prettyCurrentTime}` **Message** 📝 `#{e.Channel.Name}`
                 });
 
             cgb.CreateCommand(Module.Prefix + "logserver")
-                  .Description("Toggles logging in this channel. Logs every message sent/deleted/edited on the server. **Bot Owner Only!**")
+                  .Description($"Toggles logging in this channel. Logs every message sent/deleted/edited on the server. **Bot Owner Only!** | `{Prefix}logserver`")
                   .AddCheck(SimpleCheckers.OwnerOnly())
                   .AddCheck(SimpleCheckers.ManageServer())
                   .Do(async e =>
@@ -371,14 +406,14 @@ $@"🕔`{prettyCurrentTime}` **Message** 📝 `#{e.Channel.Name}`
                       Channel ch;
                       if ((ch = e.Server.TextChannels.Where(tc => tc.Id == chId).FirstOrDefault()) == null)
                           return;
-                          
-                      SpecificConfigurations.Default.Of (e.Server.Id).LogServerChannel = null;
+
+                      SpecificConfigurations.Default.Of(e.Server.Id).LogServerChannel = null;
                       await e.Channel.SendMessage($"❗**NO LONGER LOGGING IN {ch.Mention} CHANNEL**❗").ConfigureAwait(false);
                   });
 
 
             cgb.CreateCommand(Prefix + "logignore")
-                .Description($"Toggles whether the {Prefix}logserver command ignores this channel. Useful if you have hidden admin channel and public log channel.")
+                .Description($"Toggles whether the {Prefix}logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. | `{Prefix}logignore`")
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(async e =>
@@ -396,7 +431,7 @@ $@"🕔`{prettyCurrentTime}` **Message** 📝 `#{e.Channel.Name}`
                 });
 
             cgb.CreateCommand(Module.Prefix + "userpresence")
-                  .Description("Starts logging to this channel when someone from the server goes online/offline/idle.")
+                  .Description($"Starts logging to this channel when someone from the server goes online/offline/idle. | `{Prefix}userpresence`")
                   .AddCheck(SimpleCheckers.ManageServer())
                   .Do(async e =>
                   {
@@ -412,7 +447,7 @@ $@"🕔`{prettyCurrentTime}` **Message** 📝 `#{e.Channel.Name}`
                   });
 
             cgb.CreateCommand(Module.Prefix + "voicepresence")
-                  .Description("Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now.")
+                  .Description("Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now. | `{Prefix}voicerpresence`")
                   .Parameter("all", ParameterType.Optional)
                   .AddCheck(SimpleCheckers.ManageServer())
                   .Do(async e =>
diff --git a/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs b/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs
index 4aa521a1..2ea4346d 100644
--- a/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs
+++ b/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs
@@ -57,7 +57,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Module.Prefix + "repeatinvoke")
                 .Alias(Module.Prefix + "repinv")
-                .Description("Immediately shows the repeat message and restarts the timer.")
+                .Description($"Immediately shows the repeat message and restarts the timer. | `{Prefix}repinv`")
                 .AddCheck(SimpleCheckers.ManageMessages())
                 .Do(async e =>
                 {
@@ -73,7 +73,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Module.Prefix + "repeat")
                 .Description("Repeat a message every X minutes. If no parameters are specified, " +
-                             "repeat is disabled. Requires manage messages. |`.repeat 5 Hello there`")
+                             $"repeat is disabled. Requires manage messages. |`{Prefix}repeat 5 Hello there`")
                 .Parameter("minutes", ParameterType.Optional)
                 .Parameter("msg", ParameterType.Unparsed)
                 .AddCheck(SimpleCheckers.ManageMessages())
diff --git a/NadekoBot/Modules/Administration/Commands/PlayingRotate.cs b/NadekoBot/Modules/Administration/Commands/PlayingRotate.cs
index 2d22d870..4978dbe3 100644
--- a/NadekoBot/Modules/Administration/Commands/PlayingRotate.cs
+++ b/NadekoBot/Modules/Administration/Commands/PlayingRotate.cs
@@ -96,14 +96,14 @@ namespace NadekoBot.Modules.Administration.Commands
         {
             cgb.CreateCommand(Module.Prefix + "rotateplaying")
                 .Alias(Module.Prefix + "ropl")
-                .Description("Toggles rotation of playing status of the dynamic strings you specified earlier.")
+                .Description($"Toggles rotation of playing status of the dynamic strings you specified earlier. | `{Prefix}ropl`")
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(DoFunc());
 
             cgb.CreateCommand(Module.Prefix + "addplaying")
                 .Alias(Module.Prefix + "adpl")
                 .Description("Adds a specified string to the list of playing strings to rotate. " +
-                             "Supported placeholders: " + string.Join(", ", PlayingPlaceholders.Keys))
+                             "Supported placeholders: " + string.Join(", ", PlayingPlaceholders.Keys)+ $" | `{Prefix}adpl`")
                 .Parameter("text", ParameterType.Unparsed)
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(async e =>
@@ -126,7 +126,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Module.Prefix + "listplaying")
                 .Alias(Module.Prefix + "lipl")
-                .Description("Lists all playing statuses with their corresponding number.")
+                .Description($"Lists all playing statuses with their corresponding number. | `{Prefix}lipl`")
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(async e =>
                 {
@@ -143,7 +143,7 @@ namespace NadekoBot.Modules.Administration.Commands
 
             cgb.CreateCommand(Module.Prefix + "removeplaying")
                 .Alias(Module.Prefix + "repl", Module.Prefix + "rmpl")
-                .Description("Removes a playing string on a given number.")
+                .Description($"Removes a playing string on a given number. | `{Prefix}rmpl`")
                 .Parameter("number", ParameterType.Required)
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(async e =>
diff --git a/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs b/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs
index 22e0d695..c9efe84e 100644
--- a/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs
+++ b/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs
@@ -41,7 +41,7 @@ namespace NadekoBot.Modules.Administration.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "slowmode")
-                .Description("Toggles slow mode. When ON, users will be able to send only 1 message every 5 seconds.")
+                .Description($"Toggles slow mode. When ON, users will be able to send only 1 message every 5 seconds. | `{Prefix}slowmode`")
                 .AddCheck(SimpleCheckers.ManageMessages())
                 .Do(async e =>
                 {
diff --git a/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs b/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs
index 2ef54772..4386ab11 100644
--- a/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs
+++ b/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs
@@ -17,7 +17,7 @@ namespace NadekoBot.Modules.Administration.Commands
         {
             cgb.CreateCommand(Module.Prefix + "asar")
                 .Description("Adds a role, or list of roles separated by whitespace" +
-                             "(use quotations for multiword roles) to the list of self-assignable roles. | .asar Gamer")
+                             $"(use quotations for multiword roles) to the list of self-assignable roles. | {Prefix}asar Gamer")
                 .Parameter("roles", ParameterType.Multiple)
                 .AddCheck(SimpleCheckers.CanManageRoles)
                 .Do(async e =>
@@ -44,7 +44,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "rsar")
-                .Description("Removes a specified role from the list of self-assignable roles.")
+                .Description($"Removes a specified role from the list of self-assignable roles. | `{Prefix}rsar`")
                 .Parameter("role", ParameterType.Unparsed)
                 .AddCheck(SimpleCheckers.CanManageRoles)
                 .Do(async e =>
@@ -69,14 +69,14 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "lsar")
-                .Description("Lists all self-assignable roles.")
+                .Description($"Lists all self-assignable roles. | `{Prefix}lsar`")
                 .Parameter("roles", ParameterType.Multiple)
                 .Do(async e =>
                 {
                     var config = SpecificConfigurations.Default.Of(e.Server.Id);
                     var msg = new StringBuilder($"There are `{config.ListOfSelfAssignableRoles.Count}` self assignable roles:\n");
                     var toRemove = new HashSet<ulong>();
-                    foreach (var roleId in config.ListOfSelfAssignableRoles.OrderBy(r=>r.ToString()))
+                    foreach (var roleId in config.ListOfSelfAssignableRoles.OrderBy(r => r.ToString()))
                     {
                         var role = e.Server.GetRole(roleId);
                         if (role == null)
@@ -98,8 +98,8 @@ namespace NadekoBot.Modules.Administration.Commands
 
 
 
-            cgb.CreateCommand(Module.Prefix + "togglexclsar").Alias(Module.Prefix +"tesar")
-                .Description("toggle whether the self-assigned roles should be exclusive")
+            cgb.CreateCommand(Module.Prefix + "togglexclsar").Alias(Module.Prefix + "tesar")
+                .Description($"toggle whether the self-assigned roles should be exclusive | `{Prefix}tesar`")
                 .AddCheck(SimpleCheckers.CanManageRoles)
                 .Do(async e =>
                 {
@@ -112,7 +112,7 @@ namespace NadekoBot.Modules.Administration.Commands
             cgb.CreateCommand(Module.Prefix + "iam")
                 .Description("Adds a role to you that you choose. " +
                              "Role must be on a list of self-assignable roles." +
-                             " | .iam Gamer")
+                             $" | {Prefix}iam Gamer")
                 .Parameter("role", ParameterType.Unparsed)
                 .Do(async e =>
                 {
@@ -146,12 +146,13 @@ namespace NadekoBot.Modules.Administration.Commands
                     {
                         await e.User.AddRoles(role).ConfigureAwait(false);
                     }
-                    catch(HttpException ex) when (ex.StatusCode == System.Net.HttpStatusCode.InternalServerError)
+                    catch (HttpException ex) when (ex.StatusCode == System.Net.HttpStatusCode.InternalServerError)
                     {
                     }
-                    catch (Exception)
+                    catch (Exception ex)
                     {
                         await e.Channel.SendMessage($":anger:`I am unable to add that role to you. I can't add roles to owners or other roles higher than my role in the role hierarchy.`").ConfigureAwait(false);
+                        return;
                     }
                     var msg = await e.Channel.SendMessage($":ok:You now have {role.Name} role.").ConfigureAwait(false);
                     await Task.Delay(3000).ConfigureAwait(false);
@@ -167,7 +168,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 .Alias(Module.Prefix + "iamn")
                 .Description("Removes a role to you that you choose. " +
                              "Role must be on a list of self-assignable roles." +
-                             " | .iamn Gamer")
+                             $" | {Prefix}iamn Gamer")
                 .Parameter("role", ParameterType.Unparsed)
                 .Do(async e =>
                 {
diff --git a/NadekoBot/Modules/Administration/Commands/SelfCommands.cs b/NadekoBot/Modules/Administration/Commands/SelfCommands.cs
index c3b5fad2..23322e07 100644
--- a/NadekoBot/Modules/Administration/Commands/SelfCommands.cs
+++ b/NadekoBot/Modules/Administration/Commands/SelfCommands.cs
@@ -14,7 +14,7 @@ namespace NadekoBot.Modules.Administration.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "leave")
-                .Description("Makes Nadeko leave the server. Either name or id required. | `.leave 123123123331`")
+                .Description($"Makes Nadeko leave the server. Either name or id required. | `{Prefix}leave 123123123331`")
                 .Parameter("arg", ParameterType.Required)
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(async e =>
diff --git a/NadekoBot/Modules/Administration/Commands/ServerGreetCommand.cs b/NadekoBot/Modules/Administration/Commands/ServerGreetCommand.cs
index 54db0305..5281f9df 100644
--- a/NadekoBot/Modules/Administration/Commands/ServerGreetCommand.cs
+++ b/NadekoBot/Modules/Administration/Commands/ServerGreetCommand.cs
@@ -219,7 +219,7 @@ namespace NadekoBot.Modules.Administration.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "grdel")
-                .Description("Toggles automatic deletion of greet and bye messages.")
+                .Description($"Toggles automatic deletion of greet and bye messages. | `{Prefix}grdel`")
                 .Do(async e =>
                 {
                     if (!e.User.ServerPermissions.ManageServer) return;
@@ -232,7 +232,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "greet")
-                .Description("Toggles anouncements on the current channel when someone joins the server.")
+                .Description($"Toggles anouncements on the current channel when someone joins the server. | `{Prefix}greet`")
                 .Do(async e =>
                 {
                     if (!e.User.ServerPermissions.ManageServer) return;
@@ -245,7 +245,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "greetmsg")
-                .Description("Sets a new join announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. | .greetmsg Welcome to the server, %user%.")
+                .Description($"Sets a new join announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. | `{Prefix}greetmsg Welcome to the server, %user%.`")
                 .Parameter("msg", ParameterType.Unparsed)
                 .Do(async e =>
                 {
@@ -265,7 +265,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "bye")
-                .Description("Toggles anouncements on the current channel when someone leaves the server.")
+                .Description($"Toggles anouncements on the current channel when someone leaves the server. | `{Prefix}bye`")
                 .Do(async e =>
                 {
                     if (!e.User.ServerPermissions.ManageServer) return;
@@ -278,7 +278,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "byemsg")
-                .Description("Sets a new leave announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current bye message. | .byemsg %user% has left the server.")
+                .Description($"Sets a new leave announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current bye message. | `{Prefix}byemsg %user% has left the server.`")
                 .Parameter("msg", ParameterType.Unparsed)
                 .Do(async e =>
                 {
@@ -297,7 +297,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "byepm")
-                .Description("Toggles whether the good bye messages will be sent in a PM or in the text channel.")
+                .Description($"Toggles whether the good bye messages will be sent in a PM or in the text channel. | `{Prefix}byepm`")
                 .Do(async e =>
                 {
                     if (!e.User.ServerPermissions.ManageServer) return;
@@ -313,7 +313,7 @@ namespace NadekoBot.Modules.Administration.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "greetpm")
-                .Description("Toggles whether the greet messages will be sent in a PM or in the text channel.")
+                .Description($"Toggles whether the greet messages will be sent in a PM or in the text channel. | `{Prefix}greetpm`")
                 .Do(async e =>
                 {
                     if (!e.User.ServerPermissions.ManageServer) return;
diff --git a/NadekoBot/Modules/Administration/Commands/VoiceNotificationCommand.cs b/NadekoBot/Modules/Administration/Commands/VoiceNotificationCommand.cs
deleted file mode 100644
index ae63a7db..00000000
--- a/NadekoBot/Modules/Administration/Commands/VoiceNotificationCommand.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using Discord;
-using Discord.Commands;
-using NadekoBot.Classes;
-using System;
-using System.Collections.Concurrent;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace NadekoBot.Modules.Administration.Commands
-{
-    internal class VoiceNotificationCommand : DiscordCommand
-    {
-
-        //voicechannel/text channel
-        private readonly ConcurrentDictionary<Channel, Channel> subscribers = new ConcurrentDictionary<Channel, Channel>();
-
-        public Func<CommandEventArgs, Task> DoFunc() => async e =>
-        {
-            var arg = e.GetArg("voice_name");
-            if (string.IsNullOrWhiteSpace("voice_name"))
-                return;
-            var voiceChannel = e.Server.FindChannels(arg, ChannelType.Voice).FirstOrDefault();
-            if (voiceChannel == null)
-                return;
-            if (subscribers.ContainsKey(voiceChannel))
-            {
-                await e.Channel.SendMessage("`Voice channel notifications disabled.`").ConfigureAwait(false);
-                return;
-            }
-            if (subscribers.TryAdd(voiceChannel, e.Channel))
-            {
-                await e.Channel.SendMessage("`Voice channel notifications enabled.`").ConfigureAwait(false);
-            }
-        };
-
-        internal override void Init(CommandGroupBuilder cgb)
-        {
-            cgb.CreateCommand(Module.Prefix + "voicenotif")
-                  .Description("Enables notifications on who joined/left the voice channel. |.voicenotif Karaoke club")
-                  .Parameter("voice_name", ParameterType.Unparsed)
-                  .Do(DoFunc());
-        }
-
-        public VoiceNotificationCommand(DiscordModule module) : base(module) { }
-    }
-}
diff --git a/NadekoBot/Modules/Administration/Commands/VoicePlusTextCommand.cs b/NadekoBot/Modules/Administration/Commands/VoicePlusTextCommand.cs
index be6bae12..bf5e2a73 100644
--- a/NadekoBot/Modules/Administration/Commands/VoicePlusTextCommand.cs
+++ b/NadekoBot/Modules/Administration/Commands/VoicePlusTextCommand.cs
@@ -88,7 +88,7 @@ namespace NadekoBot.Modules.Administration.Commands
         {
             cgb.CreateCommand(Module.Prefix + "cleanv+t")
                 .Alias(Module.Prefix + "cv+t")
-                .Description("Deletes all text channels ending in `-voice` for which voicechannels are not found. **Use at your own risk.**")
+                .Description($"Deletes all text channels ending in `-voice` for which voicechannels are not found. **Use at your own risk.** | `{Prefix}cleanv+t`")
                 .AddCheck(SimpleCheckers.CanManageRoles)
                 .AddCheck(SimpleCheckers.ManageChannels())
                 .Do(async e =>
@@ -120,7 +120,7 @@ namespace NadekoBot.Modules.Administration.Commands
             cgb.CreateCommand(Module.Prefix + "voice+text")
                 .Alias(Module.Prefix + "v+t")
                 .Description("Creates a text channel for each voice channel only users in that voice channel can see." +
-                             "If you are server owner, keep in mind you will see them all the time regardless.")
+                             $"If you are server owner, keep in mind you will see them all the time regardless. | `{Prefix}voice+text`")
                 .AddCheck(SimpleCheckers.ManageChannels())
                 .AddCheck(SimpleCheckers.CanManageRoles)
                 .Do(async e =>
diff --git a/NadekoBot/Modules/Conversations/Conversations.cs b/NadekoBot/Modules/Conversations/Conversations.cs
index 7432803f..a3611d0e 100644
--- a/NadekoBot/Modules/Conversations/Conversations.cs
+++ b/NadekoBot/Modules/Conversations/Conversations.cs
@@ -8,7 +8,6 @@ using NadekoBot.Modules.Permissions.Classes;
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -42,7 +41,7 @@ namespace NadekoBot.Modules.Conversations
                         if (string.IsNullOrWhiteSpace(text))
                             return;
                         await Task.Run(() =>
-                            Classes.DbHandler.Instance.InsertData(new DataModels.UserQuote()
+                            Classes.DbHandler.Instance.Connection.Insert(new DataModels.UserQuote()
                             {
                                 DateAdded = DateTime.Now,
                                 Keyword = e.GetArg("keyword").ToLowerInvariant(),
@@ -102,7 +101,7 @@ namespace NadekoBot.Modules.Conversations
                 commands.ForEach(cmd => cmd.Init(cgb));
 
                 cgb.CreateCommand("die")
-                    .Description("Works only for the owner. Shuts the bot down.")
+                    .Description("Works only for the owner. Shuts the bot down. | `@NadekoBot die`")
                     .Do(async e =>
                     {
                         if (NadekoBot.IsOwner(e.User.Id))
@@ -119,7 +118,7 @@ namespace NadekoBot.Modules.Conversations
                 randServerSw.Start();
 
                 cgb.CreateCommand("do you love me")
-                    .Description("Replies with positive answer only to the bot owner.")
+                    .Description("Replies with positive answer only to the bot owner. | `@NadekoBot do you love me`")
                     .Do(async e =>
                     {
                         if (NadekoBot.IsOwner(e.User.Id))
@@ -130,7 +129,7 @@ namespace NadekoBot.Modules.Conversations
 
                 cgb.CreateCommand("how are you")
                     .Alias("how are you?")
-                    .Description("Replies positive only if bot owner is online.")
+                    .Description("Replies positive only if bot owner is online. | `@NadekoBot how are you`")
                     .Do(async e =>
                     {
                         if (NadekoBot.IsOwner(e.User.Id))
@@ -150,7 +149,7 @@ namespace NadekoBot.Modules.Conversations
                     });
 
                 cgb.CreateCommand("fire")
-                    .Description("Shows a unicode fire message. Optional parameter [x] tells her how many times to repeat the fire. | @NadekoBot fire [x]")
+                    .Description("Shows a unicode fire message. Optional parameter [x] tells her how many times to repeat the fire. | `@NadekoBot fire [x]`")
                     .Parameter("times", ParameterType.Optional)
                     .Do(async e =>
                     {
@@ -174,7 +173,7 @@ namespace NadekoBot.Modules.Conversations
                     });
 
                 cgb.CreateCommand("dump")
-                    .Description("Dumps all of the invites it can to dump.txt.** Owner Only.**")
+                    .Description("Dumps all of the invites it can to dump.txt.** Owner Only.** | `@NadekoBot dump`")
                     .Do(async e =>
                     {
                         if (!NadekoBot.IsOwner(e.User.Id)) return;
@@ -201,7 +200,7 @@ namespace NadekoBot.Modules.Conversations
                     });
 
                 cgb.CreateCommand("ab")
-                    .Description("Try to get 'abalabahaha'")
+                    .Description("Try to get 'abalabahaha'| `@NadekoBot ab`")
                     .Do(async e =>
                     {
                         string[] strings = { "ba", "la", "ha" };
diff --git a/NadekoBot/Modules/Gambling/Commands/AnimalRacing.cs b/NadekoBot/Modules/Gambling/Commands/AnimalRacing.cs
index ae6c6819..a908128c 100644
--- a/NadekoBot/Modules/Gambling/Commands/AnimalRacing.cs
+++ b/NadekoBot/Modules/Gambling/Commands/AnimalRacing.cs
@@ -1,14 +1,13 @@
-using NadekoBot.Classes;
+using Discord;
+using Discord.Commands;
+using NadekoBot.Classes;
+using NadekoBot.Extensions;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Discord.Commands;
-using System.Collections.Concurrent;
-using Discord;
-using NadekoBot.Extensions;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.Gambling.Commands
 {
@@ -23,8 +22,9 @@ namespace NadekoBot.Modules.Gambling.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Prefix + "race")
-                .Description("Starts a new animal race.")
-                .Do(e => {
+                .Description($"Starts a new animal race. | `{Prefix}race`")
+                .Do(e =>
+                {
                     var ar = new AnimalRace(e.Server.Id, e.Channel);
                     if (ar.Fail)
                     {
@@ -35,9 +35,10 @@ namespace NadekoBot.Modules.Gambling.Commands
 
             cgb.CreateCommand(Prefix + "joinrace")
                 .Alias(Prefix + "jr")
-                .Description("Joins a new race. You can specify an amount of flowers for betting (optional). You will get YourBet*(participants-1) back if you win. | `$jr` or `$jr 5`")
+                .Description($"Joins a new race. You can specify an amount of flowers for betting (optional). You will get YourBet*(participants-1) back if you win. | `{Prefix}jr` or `{Prefix}jr 5`")
                 .Parameter("amount", ParameterType.Optional)
-                .Do(async e => {
+                .Do(async e =>
+                {
 
                     int amount;
                     if (!int.TryParse(e.GetArg("amount"), out amount) || amount < 0)
@@ -55,11 +56,13 @@ namespace NadekoBot.Modules.Gambling.Commands
                         await FlowersHandler.RemoveFlowers(e.User, "BetRace", (int)amount, true).ConfigureAwait(false);
 
                     AnimalRace ar;
-                    if (!AnimalRaces.TryGetValue(e.Server.Id, out ar)) {
+                    if (!AnimalRaces.TryGetValue(e.Server.Id, out ar))
+                    {
                         await e.Channel.SendMessage("No race exists on this server");
+                        return;
                     }
                     await ar.JoinRace(e.User, amount);
-                    
+
                 });
         }
 
@@ -93,7 +96,7 @@ namespace NadekoBot.Modules.Gambling.Commands
                 {
                     try
                     {
-                        await raceChannel.SendMessage($"🏁`Race is starting in 20 seconds or when the room is full. Type $jr to join the race.`");
+                        await raceChannel.SendMessage($"🏁`Race is starting in 20 seconds or when the room is full. Type {NadekoBot.Config.CommandPrefixes.Gambling}jr to join the race.`");
                         var t = await Task.WhenAny(Task.Delay(20000, token), fullgame);
                         Started = true;
                         cancelSource.Cancel();
@@ -103,7 +106,7 @@ namespace NadekoBot.Modules.Gambling.Commands
                         }
                         else if (participants.Count > 1)
                         {
-                            await raceChannel.SendMessage("🏁`Game starting with " + participants.Count + " praticipants.`");
+                            await raceChannel.SendMessage("🏁`Game starting with " + participants.Count + " participants.`");
                         }
                         else
                         {
@@ -127,7 +130,8 @@ namespace NadekoBot.Modules.Gambling.Commands
                 AnimalRaces.TryRemove(serverId, out throwaway);
             }
 
-            private async Task StartRace() {
+            private async Task StartRace()
+            {
                 var rng = new Random();
                 Participant winner = null;
                 Message msg = null;
@@ -163,14 +167,14 @@ namespace NadekoBot.Modules.Gambling.Commands
 |🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🏁🔚|";
                         if (msg == null || messagesSinceGameStarted >= 10) // also resend the message if channel was spammed
                         {
-                            if(msg != null)
+                            if (msg != null)
                                 try { await msg.Delete(); } catch { }
                             msg = await raceChannel.SendMessage(text);
                             messagesSinceGameStarted = 0;
                         }
                         else
                             await msg.Edit(text);
-                        
+
                         await Task.Delay(2500);
                     }
                 }
@@ -199,10 +203,11 @@ namespace NadekoBot.Modules.Gambling.Commands
                 messagesSinceGameStarted++;
             }
 
-            private async Task CheckForFullGameAsync(CancellationToken cancelToken) {
+            private async Task CheckForFullGameAsync(CancellationToken cancelToken)
+            {
                 while (animals.Count > 0)
                 {
-                    await Task.Delay(100,cancelToken);
+                    await Task.Delay(100, cancelToken);
                 }
             }
 
@@ -257,8 +262,8 @@ namespace NadekoBot.Modules.Gambling.Commands
             public override bool Equals(object obj)
             {
                 var p = obj as Participant;
-                return  p == null?
-                    false:
+                return p == null ?
+                    false :
                     p.User == User;
             }
 
@@ -279,7 +284,8 @@ namespace NadekoBot.Modules.Gambling.Commands
                 {
                     return str + "`3rd`";
                 }
-                else {
+                else
+                {
                     return str + $"`{Place}th`";
                 }
 
diff --git a/NadekoBot/Modules/Gambling/DiceRollCommand.cs b/NadekoBot/Modules/Gambling/DiceRollCommand.cs
index 68a665fe..55bb5ee1 100644
--- a/NadekoBot/Modules/Gambling/DiceRollCommand.cs
+++ b/NadekoBot/Modules/Gambling/DiceRollCommand.cs
@@ -21,18 +21,18 @@ namespace NadekoBot.Modules.Gambling
         {
             cgb.CreateCommand(Module.Prefix + "roll")
                 .Description("Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice." +
-                             " If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. | $roll or $roll 7 or $roll 3d5")
+                             $" If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. | `{Prefix}roll` or `{Prefix}roll 7` or `{Prefix}roll 3d5`")
                 .Parameter("num", ParameterType.Optional)
                 .Do(RollFunc());
 
             cgb.CreateCommand(Module.Prefix + "rolluo")
                 .Description("Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice (unordered)." +
-                             " If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. | $roll or $roll 7 or $roll 3d5")
+                             $" If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. | `{Prefix}roll` or `{Prefix}roll` 7 or `{Prefix}roll 3d5`")
                 .Parameter("num", ParameterType.Optional)
                 .Do(RollFunc(false));
 
             cgb.CreateCommand(Module.Prefix + "nroll")
-                .Description("Rolls in a given range. | `$nroll 5` (rolls 0-5) or `$nroll 5-15`")
+                .Description($"Rolls in a given range. | `{Prefix}nroll 5` (rolls 0-5) or `{Prefix}nroll 5-15`")
                 .Parameter("range", ParameterType.Required)
                 .Do(NRollFunc());
         }
diff --git a/NadekoBot/Modules/Gambling/DrawCommand.cs b/NadekoBot/Modules/Gambling/DrawCommand.cs
index 35d789bf..dbd023e1 100644
--- a/NadekoBot/Modules/Gambling/DrawCommand.cs
+++ b/NadekoBot/Modules/Gambling/DrawCommand.cs
@@ -17,13 +17,13 @@ namespace NadekoBot.Modules.Gambling
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "draw")
-                .Description("Draws a card from the deck.If you supply number [x], she draws up to 5 cards from the deck. | $draw [x]")
+                .Description($"Draws a card from the deck.If you supply number [x], she draws up to 5 cards from the deck. | `{Prefix}draw [x]`")
                 .Parameter("count", ParameterType.Optional)
                 .Do(DrawCardFunc());
 
             cgb.CreateCommand(Module.Prefix + "shuffle")
                 .Alias(Module.Prefix + "sh")
-                .Description("Reshuffles all cards back into the deck.")
+                .Description($"Reshuffles all cards back into the deck.|`{Prefix}shuffle`")
                 .Do(ReshuffleTask());
         }
 
diff --git a/NadekoBot/Modules/Gambling/FlipCoinCommand.cs b/NadekoBot/Modules/Gambling/FlipCoinCommand.cs
index 6d8edf3c..d0b79919 100644
--- a/NadekoBot/Modules/Gambling/FlipCoinCommand.cs
+++ b/NadekoBot/Modules/Gambling/FlipCoinCommand.cs
@@ -15,7 +15,7 @@ namespace NadekoBot.Modules.Gambling
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "flip")
-                .Description("Flips coin(s) - heads or tails, and shows an image. | `$flip` or `$flip 3`")
+                .Description($"Flips coin(s) - heads or tails, and shows an image. | `{Prefix}flip` or `{Prefix}flip 3`")
                 .Parameter("count", ParameterType.Optional)
                 .Do(FlipCoinFunc());
 
diff --git a/NadekoBot/Modules/Gambling/GamblingModule.cs b/NadekoBot/Modules/Gambling/GamblingModule.cs
index 2b1ddc15..efa3a553 100644
--- a/NadekoBot/Modules/Gambling/GamblingModule.cs
+++ b/NadekoBot/Modules/Gambling/GamblingModule.cs
@@ -33,7 +33,7 @@ namespace NadekoBot.Modules.Gambling
                 commands.ForEach(com => com.Init(cgb));
 
                 cgb.CreateCommand(Prefix + "raffle")
-                    .Description($"Prints a name and ID of a random user from the online list from the (optional) role. | `{Prefix}raffle` or `{Prefix}raffle RoleName")
+                    .Description($"Prints a name and ID of a random user from the online list from the (optional) role. | `{Prefix}raffle` or `{Prefix}raffle RoleName`")
                     .Parameter("role", ParameterType.Optional)
                     .Do(async e =>
                     {
@@ -63,7 +63,7 @@ namespace NadekoBot.Modules.Gambling
                     });
 
                 cgb.CreateCommand(Prefix + "give")
-                    .Description(string.Format("Give someone a certain amount of {0}s", NadekoBot.Config.CurrencyName))
+                    .Description(string.Format("Give someone a certain amount of {0}s", NadekoBot.Config.CurrencyName)+ $"|`{Prefix}give 1 \"@SomeGuy\"`")
                     .Parameter("amount", ParameterType.Required)
                     .Parameter("receiver", ParameterType.Unparsed)
                     .Do(async e =>
@@ -140,7 +140,7 @@ namespace NadekoBot.Modules.Gambling
 
                 cgb.CreateCommand(Prefix + "betroll")
                     .Alias(Prefix + "br")
-                    .Description($"Bets a certain amount of {NadekoBot.Config.CurrencyName}s and rolls a dice. Rolling over 66 yields x2 flowers, over 90 - x3 and 100 x10. | {Prefix}br 5")
+                    .Description($"Bets a certain amount of {NadekoBot.Config.CurrencyName}s and rolls a dice. Rolling over 66 yields x2 flowers, over 90 - x3 and 100 x10. | `{Prefix}br 5`")
                     .Parameter("amount",ParameterType.Required)
                     .Do(async e =>
                     {
@@ -187,6 +187,7 @@ namespace NadekoBot.Modules.Gambling
 
                 cgb.CreateCommand(Prefix + "leaderboard")
                     .Alias(Prefix + "lb")
+                    .Description($"Displays bot currency leaderboard | {Prefix}lb")
                     .Do(async e =>
                     {
                         var richestTemp = DbHandler.Instance.GetTopRichest();
diff --git a/NadekoBot/Modules/Games/Commands/BetrayGame.cs b/NadekoBot/Modules/Games/Commands/BetrayGame.cs
index 0bf410b5..74b98bf6 100644
--- a/NadekoBot/Modules/Games/Commands/BetrayGame.cs
+++ b/NadekoBot/Modules/Games/Commands/BetrayGame.cs
@@ -20,7 +20,7 @@ namespace NadekoBot.Modules.Games.Commands
             cgb.CreateCommand(Module.Prefix + "betray")
                 .Description("BETRAY GAME. Betray nadeko next turn." +
                              "If Nadeko cooperates - you get extra points, nadeko loses a LOT." +
-                             "If Nadeko betrays - you both lose some points.")
+                             $"If Nadeko betrays - you both lose some points. | `{Prefix}betray`")
                 .Do(async e =>
                 {
                     await ReceiveAnswer(e, Answers.Betray).ConfigureAwait(false);
@@ -29,7 +29,7 @@ namespace NadekoBot.Modules.Games.Commands
             cgb.CreateCommand(Module.Prefix + "cooperate")
                 .Description("BETRAY GAME. Cooperate with nadeko next turn." +
                              "If Nadeko cooperates - you both get bonus points." +
-                             "If Nadeko betrays - you lose A LOT, nadeko gets extra.")
+                             $"If Nadeko betrays - you lose A LOT, nadeko gets extra. | `{Prefix}cooperater`")
                 .Do(async e =>
                 {
 
diff --git a/NadekoBot/Modules/Games/Commands/Leet.cs b/NadekoBot/Modules/Games/Commands/Leet.cs
index 22cdedbf..e71a80d0 100644
--- a/NadekoBot/Modules/Games/Commands/Leet.cs
+++ b/NadekoBot/Modules/Games/Commands/Leet.cs
@@ -1,5 +1,6 @@
 using Discord.Commands;
 using NadekoBot.Classes;
+using NadekoBot.Extensions;
 using System.Text;
 
 //taken from 
@@ -291,13 +292,13 @@ namespace NadekoBot.Modules.Games.Commands
                 }
                 #endregion
             }
-            return sb.ToString(); // Return result.
+            return sb.ToString().TrimTo(1995); // Return result.
         }
 
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "leet")
-                .Description($"Converts a text to leetspeak with 6 (1-6) severity levels | {Module.Prefix}leet 3 Hello")
+                .Description($"Converts a text to leetspeak with 6 (1-6) severity levels | `{Module.Prefix}leet 3 Hello`")
                 .Parameter("level", ParameterType.Required)
                 .Parameter("text", ParameterType.Unparsed)
                 .Do(async e =>
diff --git a/NadekoBot/Modules/Games/Commands/PlantPick.cs b/NadekoBot/Modules/Games/Commands/PlantPick.cs
index d2882eb2..2752ad1f 100644
--- a/NadekoBot/Modules/Games/Commands/PlantPick.cs
+++ b/NadekoBot/Modules/Games/Commands/PlantPick.cs
@@ -65,7 +65,7 @@ namespace NadekoBot.Modules.Games.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "pick")
-                .Description("Picks a flower planted in this channel.")
+                .Description($"Picks a flower planted in this channel. | `{Prefix}pick`")
                 .Do(async e =>
                 {
                     IEnumerable<Message> msgs;
@@ -91,7 +91,7 @@ namespace NadekoBot.Modules.Games.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "plant")
-                .Description("Spend a flower to plant it in this channel. (If bot is restarted or crashes, flower will be lost)")
+                .Description($"Spend a flower to plant it in this channel. (If bot is restarted or crashes, flower will be lost) | `{Prefix}plant`")
                 .Do(async e =>
                 {
                     await locker.WaitAsync().ConfigureAwait(false);
@@ -124,7 +124,7 @@ namespace NadekoBot.Modules.Games.Commands
 
             cgb.CreateCommand(Prefix + "gencurrency")
                 .Alias(Prefix + "gc")
-                .Description($"Toggles currency generation on this channel. Every posted message will have 2% chance to spawn a {NadekoBot.Config.CurrencyName}. Optional parameter cooldown time in minutes, 5 minutes by default. Requires Manage Messages permission. | `>gc` or `>gc 60`")
+                .Description($"Toggles currency generation on this channel. Every posted message will have 2% chance to spawn a {NadekoBot.Config.CurrencyName}. Optional parameter cooldown time in minutes, 5 minutes by default. Requires Manage Messages permission. | `{Prefix}gc` or `{Prefix}gc 60`")
                 .AddCheck(SimpleCheckers.ManageMessages())
                 .Parameter("cd", ParameterType.Unparsed)
                 .Do(async e =>
diff --git a/NadekoBot/Modules/Games/Commands/PollCommand.cs b/NadekoBot/Modules/Games/Commands/PollCommand.cs
index 0e1bb81c..785d5c5f 100644
--- a/NadekoBot/Modules/Games/Commands/PollCommand.cs
+++ b/NadekoBot/Modules/Games/Commands/PollCommand.cs
@@ -18,7 +18,7 @@ namespace NadekoBot.Modules.Games.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "poll")
-                  .Description("Creates a poll, only person who has manage server permission can do it. | >poll Question?;Answer1;Answ 2;A_3")
+                  .Description($"Creates a poll, only person who has manage server permission can do it. | `{Prefix}poll Question?;Answer1;Answ 2;A_3`")
                   .Parameter("allargs", ParameterType.Unparsed)
                   .Do(async e =>
                   {
@@ -43,7 +43,7 @@ namespace NadekoBot.Modules.Games.Commands
                       }).ConfigureAwait(false);
                   });
             cgb.CreateCommand(Module.Prefix + "pollend")
-                  .Description("Stops active poll on this server and prints the results in this channel.")
+                  .Description($"Stops active poll on this server and prints the results in this channel. | `{Prefix}pollend`")
                   .Do(async e =>
                   {
                       if (!e.User.ServerPermissions.ManageChannels)
diff --git a/NadekoBot/Modules/Games/Commands/SpeedTyping.cs b/NadekoBot/Modules/Games/Commands/SpeedTyping.cs
index c224de1d..07100820 100644
--- a/NadekoBot/Modules/Games/Commands/SpeedTyping.cs
+++ b/NadekoBot/Modules/Games/Commands/SpeedTyping.cs
@@ -168,21 +168,21 @@ namespace NadekoBot.Modules.Games.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "typestart")
-                .Description("Starts a typing contest.")
+                .Description($"Starts a typing contest. | `{Prefix}typestart`")
                 .Do(DoFunc());
 
             cgb.CreateCommand(Module.Prefix + "typestop")
-                .Description("Stops a typing contest on the current channel.")
+                .Description($"Stops a typing contest on the current channel. | `{Prefix}typestop`")
                 .Do(QuitFunc());
 
             cgb.CreateCommand(Module.Prefix + "typeadd")
-                .Description("Adds a new article to the typing contest. Owner only.")
+                .Description($"Adds a new article to the typing contest. Owner only. | `{Prefix}typeadd wordswords`")
                 .Parameter("text", ParameterType.Unparsed)
                 .Do(async e =>
                 {
                     if (!NadekoBot.IsOwner(e.User.Id) || string.IsNullOrWhiteSpace(e.GetArg("text"))) return;
 
-                    DbHandler.Instance.InsertData(new TypingArticle
+                    DbHandler.Instance.Connection.Insert(new TypingArticle
                     {
                         Text = e.GetArg("text"),
                         DateAdded = DateTime.Now
diff --git a/NadekoBot/Modules/Games/Commands/TriviaCommand.cs b/NadekoBot/Modules/Games/Commands/TriviaCommand.cs
index 1873c254..75481309 100644
--- a/NadekoBot/Modules/Games/Commands/TriviaCommand.cs
+++ b/NadekoBot/Modules/Games/Commands/TriviaCommand.cs
@@ -46,7 +46,7 @@ namespace NadekoBot.Modules.Games.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "tl")
-                .Description("Shows a current trivia leaderboard.")
+                .Description($"Shows a current trivia leaderboard. | `{Prefix}tl`")
                 .Do(async e =>
                 {
                     TriviaGame trivia;
@@ -57,7 +57,7 @@ namespace NadekoBot.Modules.Games.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "tq")
-                .Description("Quits current trivia after current question.")
+                .Description($"Quits current trivia after current question. | `{Prefix}tq`")
                 .Do(async e =>
                 {
                     TriviaGame trivia;
diff --git a/NadekoBot/Modules/Games/GamesModule.cs b/NadekoBot/Modules/Games/GamesModule.cs
index 2e222054..acdaf1b3 100644
--- a/NadekoBot/Modules/Games/GamesModule.cs
+++ b/NadekoBot/Modules/Games/GamesModule.cs
@@ -60,7 +60,7 @@ namespace NadekoBot.Modules.Games
                         try
                         {
                             await e.Channel.SendMessage(
-                                $":question: **Question**: `{question}` \n🎱 **8Ball Answers**: `{NadekoBot.Config._8BallResponses[rng.Next(0, NadekoBot.Config._8BallResponses.Length)]}`")
+                                $":question: `Question` __**{question}**__ \n🎱 `8Ball Answers` __**{NadekoBot.Config._8BallResponses[rng.Next(0, NadekoBot.Config._8BallResponses.Length)]}**__")
                                     .ConfigureAwait(false);
                         }
                         catch { }
diff --git a/NadekoBot/Modules/Help/Commands/HelpCommand.cs b/NadekoBot/Modules/Help/Commands/HelpCommand.cs
index 4d3fa441..d0ba292b 100644
--- a/NadekoBot/Modules/Help/Commands/HelpCommand.cs
+++ b/NadekoBot/Modules/Help/Commands/HelpCommand.cs
@@ -31,7 +31,7 @@ namespace NadekoBot.Classes.Help.Commands
                 if (alias != null)
                     str = $" / `{ com.Aliases.FirstOrDefault()}`";
                 if (com != null)
-                    await e.Channel.SendMessage($@"**__Help for:__ `{com.Text}`**" + str + $"\n**Desc:** {new Regex(@"\|").Replace(com.Description, "\n**Usage:**",1)}").ConfigureAwait(false);
+                    await e.Channel.SendMessage($@"**__Help for:__ `{com.Text}`**" + str + $"\n**Desc:** {new Regex(@"\|").Replace(com.Description, "\n**Usage:**", 1)}").ConfigureAwait(false);
             }).ConfigureAwait(false);
         };
         public static string HelpString {
@@ -48,11 +48,11 @@ namespace NadekoBot.Classes.Help.Commands
         public Action<CommandEventArgs> DoGitFunc() => e =>
         {
             string helpstr =
-$@"######For more information and how to setup your own NadekoBot, go to: **http://github.com/Kwoth/NadekoBot/**
-######You can donate on paypal: `nadekodiscordbot@gmail.com`
+$@"######For more information and how to setup your own NadekoBot, go to: <http://github.com/Kwoth/NadekoBot/wiki>
+######You can donate on patreon: <https://patreon.com/nadekobot>
+######or paypal: `nadekodiscordbot@gmail.com`
 
-#NadekoBot List Of Commands  
-Version: `{NadekoStats.Instance.BotVersion}`";
+#NadekoBot List Of Commands  ";
 
 
             string lastCategory = "";
@@ -80,16 +80,16 @@ Version: `{NadekoStats.Instance.BotVersion}`";
         {
             cgb.CreateCommand(Module.Prefix + "h")
                 .Alias(Module.Prefix + "help", NadekoBot.BotMention + " help", NadekoBot.BotMention + " h", "~h")
-                .Description("Either shows a help for a single command, or PMs you help link if no arguments are specified. | '-h !m q' or just '-h' ")
+                .Description($"Either shows a help for a single command, or PMs you help link if no arguments are specified. | `{Prefix}h !m q` or just `{Prefix}h` ")
                 .Parameter("command", ParameterType.Unparsed)
                 .Do(HelpFunc());
             cgb.CreateCommand(Module.Prefix + "hgit")
-                .Description("Generates the commandlist.md file. **Bot Owner Only!**")
+                .Description($"Generates the commandlist.md file. **Bot Owner Only!** | `{Prefix}hgit`")
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(DoGitFunc());
             cgb.CreateCommand(Module.Prefix + "readme")
                 .Alias(Module.Prefix + "guide")
-                .Description("Sends a readme and a guide links to the channel.")
+                .Description($"Sends a readme and a guide links to the channel. | `{Prefix}readme` or `{Prefix}guide`")
                 .Do(async e =>
                     await e.Channel.SendMessage(
 @"**Wiki with all info**: <https://github.com/Kwoth/NadekoBot/wiki>
@@ -102,16 +102,15 @@ Version: `{NadekoStats.Instance.BotVersion}`";
 
             cgb.CreateCommand(Module.Prefix + "donate")
                 .Alias("~donate")
-                .Description("Instructions for helping the project!")
+                .Description($"Instructions for helping the project! | `{Prefix}donate` or `~donate`")
                 .Do(async e =>
                 {
                     await e.Channel.SendMessage(
-$@"I've created a **paypal** email for nadeko, so if you wish to support the project, you can send your donations to `nadekodiscordbot@gmail.com`
-Don't forget to leave your discord name or id in the message, so that I can reward people who help out.
-You can join nadekobot server by typing {Module.Prefix}h and you will get an invite in a private message.
+$@"You can support the project on patreon. <https://patreon.com/nadekobot> or
+You can send donations to `nadekodiscordbot@gmail.com`
+Don't forget to leave your discord name or id in the message.
 
-*If you want to support in some other way or on a different platform, please message me*"
-                    ).ConfigureAwait(false);
+**Thank you** ♥️").ConfigureAwait(false);
                 });
         }
 
diff --git a/NadekoBot/Modules/Help/HelpModule.cs b/NadekoBot/Modules/Help/HelpModule.cs
index 20e8279c..45e4dc76 100644
--- a/NadekoBot/Modules/Help/HelpModule.cs
+++ b/NadekoBot/Modules/Help/HelpModule.cs
@@ -29,7 +29,7 @@ namespace NadekoBot.Modules.Help
 
                 cgb.CreateCommand(Prefix + "modules")
                     .Alias(".modules")
-                    .Description("List all bot modules.")
+                    .Description($"List all bot modules. | `{Prefix}modules` or `.modules`")
                     .Do(async e =>
                     {
                         await e.Channel.SendMessage("`List of modules:` \n• " + string.Join("\n• ", NadekoBot.Client.GetService<ModuleService>().Modules.Select(m => m.Name)) + $"\n`Type \"{Prefix}commands module_name\" to get a list of commands in that module.`")
@@ -38,7 +38,7 @@ namespace NadekoBot.Modules.Help
 
                 cgb.CreateCommand(Prefix + "commands")
                     .Alias(".commands")
-                    .Description("List all of the bot's commands from a certain module.")
+                    .Description($"List all of the bot's commands from a certain module. | `{Prefix}commands` or `.commands`")
                     .Parameter("module", ParameterType.Unparsed)
                     .Do(async e =>
                     {
diff --git a/NadekoBot/Modules/Music/Classes/MusicControls.cs b/NadekoBot/Modules/Music/Classes/MusicControls.cs
index 847070eb..e13239cf 100644
--- a/NadekoBot/Modules/Music/Classes/MusicControls.cs
+++ b/NadekoBot/Modules/Music/Classes/MusicControls.cs
@@ -34,7 +34,7 @@ namespace NadekoBot.Modules.Music.Classes
         public IReadOnlyCollection<Song> Playlist => playlist;
 
         public Song CurrentSong { get; private set; }
-        private CancellationTokenSource SongCancelSource { get; set; }
+        public CancellationTokenSource SongCancelSource { get; private set; }
         private CancellationToken cancelToken { get; set; }
 
         public bool Paused { get; set; }
diff --git a/NadekoBot/Modules/Music/Classes/Song.cs b/NadekoBot/Modules/Music/Classes/Song.cs
index 08be13b8..d235776a 100644
--- a/NadekoBot/Modules/Music/Classes/Song.cs
+++ b/NadekoBot/Modules/Music/Classes/Song.cs
@@ -32,7 +32,6 @@ namespace NadekoBot.Modules.Music.Classes
         public SongInfo SongInfo { get; }
         public string QueuerName { get; set; }
 
-        private bool bufferingCompleted { get; set; } = false;
         public MusicPlayer MusicPlayer { get; set; }
 
         public string PrettyCurrentTime()
@@ -73,78 +72,22 @@ namespace NadekoBot.Modules.Music.Classes
             return this;
         }
 
-        private Task BufferSong(string filename, CancellationToken cancelToken) =>
-            Task.Factory.StartNew(async () =>
-            {
-                Process p = null;
-                try
-                {
-                    p = Process.Start(new ProcessStartInfo
-                    {
-                        FileName = "ffmpeg",
-                        Arguments = $"-ss {skipTo} -i {SongInfo.Uri} -f s16le -ar 48000 -ac 2 pipe:1 -loglevel quiet",
-                        UseShellExecute = false,
-                        RedirectStandardOutput = true,
-                        RedirectStandardError = false,
-                        CreateNoWindow = true,
-                    });
-                    var prebufferSize = 100ul.MiB();
-                    using (var outStream = new FileStream(filename, FileMode.Append, FileAccess.Write, FileShare.Read))
-                    {
-                        byte[] buffer = new byte[81920];
-                        int bytesRead;
-                        while ((bytesRead = await p.StandardOutput.BaseStream.ReadAsync(buffer, 0, buffer.Length, cancelToken).ConfigureAwait(false)) != 0)
-                        {
-                            await outStream.WriteAsync(buffer, 0, bytesRead, cancelToken).ConfigureAwait(false);
-                            while ((ulong)outStream.Length - bytesSent > prebufferSize)
-                                await Task.Delay(100, cancelToken);
-                        }
-                    }
-                        
-                    bufferingCompleted = true;
-                }
-                catch (System.ComponentModel.Win32Exception) {
-                    var oldclr = Console.ForegroundColor;
-                    Console.ForegroundColor = ConsoleColor.Red;
-                    Console.WriteLine(@"You have not properly installed or configured FFMPEG. 
-Please install and configure FFMPEG to play music. 
-Check the guides for your platform on how to setup ffmpeg correctly:
-    Windows Guide: https://goo.gl/SCv72y
-    Linux Guide:  https://goo.gl/rRhjCp");
-                    Console.ForegroundColor = oldclr;
-                }
-                catch (Exception ex)
-                {
-                    Console.WriteLine($"Buffering stopped: {ex.Message}");
-                }
-                finally
-                {
-                    Console.WriteLine($"Buffering done.");
-                    if (p != null)
-                    {
-                        try
-                        {
-                            p.Kill();
-                        }
-                        catch { }
-                        p.Dispose();
-                    }
-                }
-            }, TaskCreationOptions.LongRunning);
-
         internal async Task Play(IAudioClient voiceClient, CancellationToken cancelToken)
         {
             var filename = Path.Combine(MusicModule.MusicDataPath, DateTime.Now.UnixTimestamp().ToString());
 
-            var bufferTask = BufferSong(filename, cancelToken).ConfigureAwait(false);
+            SongBuffer sb = new SongBuffer(filename, SongInfo, skipTo);
+            var bufferTask = sb.BufferSong(cancelToken).ConfigureAwait(false);
 
-            var inStream = new FileStream(filename, FileMode.OpenOrCreate, FileAccess.Read, FileShare.Write);
+            var inStream = new FileStream(sb.GetNextFile(), FileMode.OpenOrCreate, FileAccess.Read, FileShare.Write); ;
 
             bytesSent = 0;
 
             try
             {
-                var prebufferingTask = CheckPrebufferingAsync(inStream, cancelToken);
+                var attempt = 0;             
+
+                var prebufferingTask = CheckPrebufferingAsync(inStream, sb, cancelToken);
                 var sw = new Stopwatch();
                 sw.Start();
                 var t = await Task.WhenAny(prebufferingTask, Task.Delay(5000, cancelToken));
@@ -162,7 +105,6 @@ Check the guides for your platform on how to setup ffmpeg correctly:
                 Console.WriteLine("Prebuffering successfully completed in "+ sw.Elapsed);
 
                 const int blockSize = 3840;
-                var attempt = 0;
                 byte[] buffer = new byte[blockSize];
                 while (!cancelToken.IsCancellationRequested)
                 {
@@ -173,14 +115,31 @@ Check the guides for your platform on how to setup ffmpeg correctly:
                     {
                         bytesSent += (ulong)read;
                     }
-                    if (read == 0)
-                        if (attempt++ == 20)
+                    if (read < blockSize)
+                    {
+                        if (sb.IsNextFileReady())
                         {
-                            voiceClient.Wait();
-                            break;
+                            inStream.Dispose();
+                            inStream = new FileStream(sb.GetNextFile(), FileMode.Open, FileAccess.Read, FileShare.Write);
+                            read += inStream.Read(buffer, read, buffer.Length - read);
+                            attempt = 0;
+                        }
+                        if (read == 0)
+                        {
+                            if (sb.BufferingCompleted)
+                                break;
+                            if (attempt++ == 20)
+                            {
+                                voiceClient.Wait();
+                                MusicPlayer.SongCancelSource.Cancel();
+                                break;
+                            }
+                            else
+                                await Task.Delay(100, cancelToken).ConfigureAwait(false);                         
                         }
                         else
-                            await Task.Delay(100, cancelToken).ConfigureAwait(false);
+                            attempt = 0;
+                    }
                     else
                         attempt = 0;
 
@@ -195,14 +154,16 @@ Check the guides for your platform on how to setup ffmpeg correctly:
             {
                 await bufferTask;
                 await Task.Run(() => voiceClient.Clear());
-                inStream.Dispose();
-                try { File.Delete(filename); } catch { }
+                if(inStream != null)
+                    inStream.Dispose();
+                Console.WriteLine("l");
+                sb.CleanFiles();
             }
         }
 
-        private async Task CheckPrebufferingAsync(Stream inStream, CancellationToken cancelToken)
+        private async Task CheckPrebufferingAsync(Stream inStream, SongBuffer sb, CancellationToken cancelToken)
         {
-            while (!bufferingCompleted && inStream.Length < 2.MiB())
+            while (!sb.BufferingCompleted && inStream.Length < 2.MiB())
             {
                 await Task.Delay(100, cancelToken);
             }
diff --git a/NadekoBot/Modules/Music/Classes/SongBuffer.cs b/NadekoBot/Modules/Music/Classes/SongBuffer.cs
new file mode 100644
index 00000000..d9192940
--- /dev/null
+++ b/NadekoBot/Modules/Music/Classes/SongBuffer.cs
@@ -0,0 +1,159 @@
+using NadekoBot.Extensions;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace NadekoBot.Modules.Music.Classes
+{
+    /// <summary>
+    /// Create a buffer for a song file. It will create multiples files to ensure, that radio don't fill up disk space.
+    /// It also help for large music by deleting files that are already seen.
+    /// </summary>
+    class SongBuffer
+    {
+
+        public SongBuffer(string basename, SongInfo songInfo, int skipTo)
+        {
+            Basename = basename;
+            SongInfo = songInfo;
+            SkipTo = skipTo;
+        }
+
+        private string Basename;
+
+        private SongInfo SongInfo;
+
+        private int SkipTo;
+
+        private static int MAX_FILE_SIZE = 20.MiB();
+
+        private long FileNumber = -1;
+
+        private long NextFileToRead = 0;
+
+        public bool BufferingCompleted { get; private set;} = false;
+
+        private ulong CurrentBufferSize = 0;
+
+        public Task BufferSong(CancellationToken cancelToken) =>
+           Task.Factory.StartNew(async () =>
+           {
+               Process p = null;
+               FileStream outStream = null;
+               try
+               {
+                   p = Process.Start(new ProcessStartInfo
+                   {
+                       FileName = "ffmpeg",
+                       Arguments = $"-ss {SkipTo} -i {SongInfo.Uri} -f s16le -ar 48000 -ac 2 pipe:1 -loglevel quiet",
+                       UseShellExecute = false,
+                       RedirectStandardOutput = true,
+                       RedirectStandardError = false,
+                       CreateNoWindow = true,
+                   });
+
+                   byte[] buffer = new byte[81920];
+                   int currentFileSize = 0;
+                   ulong prebufferSize = 100ul.MiB();
+
+                   outStream = new FileStream(Basename + "-" + ++FileNumber, FileMode.Append, FileAccess.Write, FileShare.Read);
+                   while (!p.HasExited) //Also fix low bandwidth
+                   {
+                       int bytesRead = await p.StandardOutput.BaseStream.ReadAsync(buffer, 0, buffer.Length, cancelToken).ConfigureAwait(false);
+                       if (currentFileSize >= MAX_FILE_SIZE)
+                       {
+                           try
+                           {
+                               outStream.Dispose();
+                           }catch { }
+                           outStream = new FileStream(Basename + "-" + ++FileNumber, FileMode.Append, FileAccess.Write, FileShare.Read);
+                           currentFileSize = bytesRead;
+                       }
+                       else
+                       {
+                           currentFileSize += bytesRead;
+                       }
+                       CurrentBufferSize += Convert.ToUInt64(bytesRead);
+                       await outStream.WriteAsync(buffer, 0, bytesRead, cancelToken).ConfigureAwait(false);
+                       while (CurrentBufferSize > prebufferSize)
+                           await Task.Delay(100, cancelToken);
+                   }
+                   BufferingCompleted = true;
+               }
+               catch (System.ComponentModel.Win32Exception)
+               {
+                   var oldclr = Console.ForegroundColor;
+                   Console.ForegroundColor = ConsoleColor.Red;
+                   Console.WriteLine(@"You have not properly installed or configured FFMPEG. 
+Please install and configure FFMPEG to play music. 
+Check the guides for your platform on how to setup ffmpeg correctly:
+    Windows Guide: https://goo.gl/SCv72y
+    Linux Guide:  https://goo.gl/rRhjCp");
+                   Console.ForegroundColor = oldclr;
+               }
+               catch (Exception ex)
+               {
+                   Console.WriteLine($"Buffering stopped: {ex.Message}");
+               }
+               finally
+               {
+                   if(outStream != null)
+                        outStream.Dispose();
+                   Console.WriteLine($"Buffering done.");
+                   if (p != null)
+                   {
+                       try
+                       {
+                           p.Kill();
+                       }
+                       catch { }
+                       p.Dispose();
+                   }
+               }
+           }, TaskCreationOptions.LongRunning);
+
+        /// <summary>
+        /// Return the next file to read, and delete the old one
+        /// </summary>
+        /// <returns>Name of the file to read</returns>
+        public string GetNextFile()
+        {
+            string filename = Basename + "-" + NextFileToRead;
+            
+            if (NextFileToRead != 0)
+            {
+                try
+                {
+                    CurrentBufferSize -= Convert.ToUInt64(new FileInfo(Basename + "-" + (NextFileToRead - 1)).Length);
+                    File.Delete(Basename + "-" + (NextFileToRead - 1));
+                }
+                catch { }
+            }
+            NextFileToRead++;
+            return filename;
+        }
+
+        public bool IsNextFileReady()
+        {
+            return NextFileToRead <= FileNumber;
+        }
+
+        public void CleanFiles()
+        {
+            for (long i = NextFileToRead - 1 ; i <= FileNumber; i++)
+            {
+                try
+                {
+                    File.Delete(Basename + "-" + i);
+                }
+                catch { }
+            }
+        }
+    }
+}
diff --git a/NadekoBot/Modules/Music/MusicModule.cs b/NadekoBot/Modules/Music/MusicModule.cs
index e5c03915..eaf290ba 100644
--- a/NadekoBot/Modules/Music/MusicModule.cs
+++ b/NadekoBot/Modules/Music/MusicModule.cs
@@ -614,11 +614,11 @@ namespace NadekoBot.Modules.Music
                         };
                         DbHandler.Instance.SaveAll(songInfos);
                         DbHandler.Instance.Save(playlist);
-                        DbHandler.Instance.InsertMany(songInfos.Select(s => new PlaylistSongInfo
+                        DbHandler.Instance.Connection.InsertAll(songInfos.Select(s => new PlaylistSongInfo
                         {
                             PlaylistId = playlist.Id.Value,
                             SongInfoId = s.Id.Value
-                        }));
+                        }), typeof(PlaylistSongInfo));
 
                         await e.Channel.SendMessage($"🎵 `Saved playlist as {name}-{playlist.Id}`").ConfigureAwait(false);
 
@@ -718,7 +718,7 @@ namespace NadekoBot.Modules.Music
                     });
 
                 cgb.CreateCommand(Prefix + "goto")
-                    .Description($"Goes to a specific time in seconds in a song. | {Prefix}goto 30")
+                    .Description($"Goes to a specific time in seconds in a song. | `{Prefix}goto 30`")
                     .Parameter("time")
                     .Do(async e =>
                     {
@@ -756,16 +756,37 @@ namespace NadekoBot.Modules.Music
 
                 cgb.CreateCommand(Prefix + "getlink")
                     .Alias(Prefix + "gl")
-                    .Description("Shows a link to the currently playing song.")
+                    .Description("Shows a link to the song in the queue by index, or the currently playing song by default.")
+                    .Parameter("index", ParameterType.Optional)
                     .Do(async e =>
                     {
                         MusicPlayer musicPlayer;
                         if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
                             return;
-                        var curSong = musicPlayer.CurrentSong;
-                        if (curSong == null)
-                            return;
-                        await e.Channel.SendMessage($"🎶`Current song:` <{curSong.SongInfo.Query}>").ConfigureAwait(false);
+                        int index;
+                        string arg = e.GetArg("index")?.Trim();
+                        if (!string.IsNullOrEmpty(arg) && int.TryParse(arg, out index))
+                        {
+
+                            var selSong = musicPlayer.Playlist.DefaultIfEmpty(null).ElementAtOrDefault(index - 1);
+                            if (selSong == null)
+                            {
+                                await e.Channel.SendMessage("Could not select song, likely wrong index");
+
+                            }
+                            else
+                            {
+                                await e.Channel.SendMessage($"🎶`Selected song {selSong.SongInfo.Title}:` <{selSong.SongInfo.Query}>").ConfigureAwait(false);
+                            }
+                        }
+                        else
+                        {
+                            var curSong = musicPlayer.CurrentSong;
+                            if (curSong == null)
+                                return;
+                            await e.Channel.SendMessage($"🎶`Current song:` <{curSong.SongInfo.Query}>").ConfigureAwait(false);
+                        }
+
                     });
 
                 cgb.CreateCommand(Prefix + "autoplay")
@@ -818,7 +839,7 @@ namespace NadekoBot.Modules.Music
                             lastFinishedMessage = await textCh.SendMessage($"🎵`Finished`{song.PrettyName}").ConfigureAwait(false);
                             if (mp.Autoplay && mp.Playlist.Count == 0 && song.SongInfo.Provider == "YouTube")
                             {
-                                await QueueSong(queuer, textCh, voiceCh, await SearchHelper.GetRelatedVideoId(song.SongInfo.Query), silent, musicType).ConfigureAwait(false);
+                                await QueueSong(queuer.Server.CurrentUser, textCh, voiceCh, (await SearchHelper.GetRelatedVideoIds(song.SongInfo.Query, 4)).ToList().Shuffle().FirstOrDefault(), silent, musicType).ConfigureAwait(false);
                             }
                         }
                         catch (Exception e)
diff --git a/NadekoBot/Modules/NSFW/NSFWModule.cs b/NadekoBot/Modules/NSFW/NSFWModule.cs
index a94ab572..ac688fb7 100644
--- a/NadekoBot/Modules/NSFW/NSFWModule.cs
+++ b/NadekoBot/Modules/NSFW/NSFWModule.cs
@@ -4,6 +4,8 @@ using NadekoBot.Classes;
 using NadekoBot.Modules.Permissions.Classes;
 using Newtonsoft.Json.Linq;
 using System;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace NadekoBot.Modules.NSFW
 {
@@ -27,16 +29,16 @@ namespace NadekoBot.Modules.NSFW
                     .Do(async e =>
                     {
                         var tag = e.GetArg("tag")?.Trim() ?? "";
-                        var gel = await SearchHelper.GetGelbooruImageLink("rating%3Aexplicit+" + tag).ConfigureAwait(false);
-                        if (gel != null)
-                            await e.Channel.SendMessage(":heart: Gelbooru: " + gel)
-                                           .ConfigureAwait(false);
-                        var dan = await SearchHelper.GetDanbooruImageLink("rating%3Aexplicit+" + tag).ConfigureAwait(false);
-                        if (dan != null)
-                            await e.Channel.SendMessage(":heart: Danbooru: " + dan)
-                                           .ConfigureAwait(false);
-                        if (dan == null && gel == null)
+
+                        var links = await Task.WhenAll(SearchHelper.GetGelbooruImageLink("rating%3Aexplicit+" + tag), SearchHelper.GetDanbooruImageLink("rating%3Aexplicit+" + tag)).ConfigureAwait(false);
+
+                        if (links.All(l => l == null))
+                        {
                             await e.Channel.SendMessage("`No results.`");
+                            return;
+                        }
+
+                        await e.Channel.SendMessage(String.Join("\n\n", links)).ConfigureAwait(false);
                     });
                 cgb.CreateCommand(Prefix + "danbooru")
                     .Description($"Shows a random hentai image from danbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) | `{Prefix}danbooru yuri+kissing`")
@@ -84,14 +86,14 @@ namespace NadekoBot.Modules.NSFW
                         await e.Channel.SendMessage(await SearchHelper.GetE621ImageLink(tag).ConfigureAwait(false)).ConfigureAwait(false);
                     });
                 cgb.CreateCommand(Prefix + "cp")
-                    .Description("We all know where this will lead you to.")
+                    .Description($"We all know where this will lead you to. | `{Prefix}cp`")
                     .Parameter("anything", ParameterType.Unparsed)
                     .Do(async e =>
                     {
                         await e.Channel.SendMessage("http://i.imgur.com/MZkY1md.jpg").ConfigureAwait(false);
                     });
                 cgb.CreateCommand(Prefix + "boobs")
-                    .Description("Real adult content.")
+                    .Description($"Real adult content. | `{Prefix}boobs`")
                     .Do(async e =>
                     {
                         try
@@ -106,7 +108,7 @@ namespace NadekoBot.Modules.NSFW
                     });
                 cgb.CreateCommand(Prefix + "butts")
                     .Alias(Prefix + "ass", Prefix + "butt")
-                    .Description("Real adult content.")
+                    .Description($"Real adult content. | `{Prefix}butts` or `{Prefix}ass`")
                     .Do(async e =>
                     {
                         try
diff --git a/NadekoBot/Modules/Permissions/Commands/FilterInvitesCommand.cs b/NadekoBot/Modules/Permissions/Commands/FilterInvitesCommand.cs
index f65902c6..d26a9aca 100644
--- a/NadekoBot/Modules/Permissions/Commands/FilterInvitesCommand.cs
+++ b/NadekoBot/Modules/Permissions/Commands/FilterInvitesCommand.cs
@@ -55,7 +55,7 @@ namespace NadekoBot.Modules.Permissions.Commands
                 .Alias(Module.Prefix + "cfi")
                 .Description("Enables or disables automatic deleting of invites on the channel." +
                              "If no channel supplied, it will default to current one. Use ALL to apply to all existing channels at once." +
-                             " | ;cfi enable #general-chat")
+                             $" | {Prefix}cfi enable #general-chat")
                 .Parameter("bool")
                 .Parameter("channel", ParameterType.Optional)
                 .Do(async e =>
@@ -95,7 +95,7 @@ namespace NadekoBot.Modules.Permissions.Commands
 
             cgb.CreateCommand(Module.Prefix + "srvrfilterinv")
                 .Alias(Module.Prefix + "sfi")
-                .Description("Enables or disables automatic deleting of invites on the server. | ;sfi disable")
+                .Description($"Enables or disables automatic deleting of invites on the server. | {Prefix}sfi disable")
                 .Parameter("bool")
                 .Do(async e =>
                 {
diff --git a/NadekoBot/Modules/Permissions/Commands/FilterWordsCommand.cs b/NadekoBot/Modules/Permissions/Commands/FilterWordsCommand.cs
index c187d398..33fd1ac4 100644
--- a/NadekoBot/Modules/Permissions/Commands/FilterWordsCommand.cs
+++ b/NadekoBot/Modules/Permissions/Commands/FilterWordsCommand.cs
@@ -53,7 +53,7 @@ namespace NadekoBot.Modules.Permissions.Commands
                 .Alias(Module.Prefix + "cfw")
                 .Description("Enables or disables automatic deleting of messages containing banned words on the channel." +
                              "If no channel supplied, it will default to current one. Use ALL to apply to all existing channels at once." +
-                             " | ;cfw enable #general-chat")
+                             $" | {Prefix}cfw enable #general-chat")
                 .Parameter("bool")
                 .Parameter("channel", ParameterType.Optional)
                 .Do(async e =>
@@ -89,7 +89,7 @@ namespace NadekoBot.Modules.Permissions.Commands
             cgb.CreateCommand(Module.Prefix + "addfilterword")
                .Alias(Module.Prefix + "afw")
                .Description("Adds a new word to the list of filtered words" +
-                            " | ;afw poop")
+                            $" | {Prefix}afw poop")
                .Parameter("word", ParameterType.Unparsed)
                .Do(async e =>
                {
@@ -111,7 +111,7 @@ namespace NadekoBot.Modules.Permissions.Commands
             cgb.CreateCommand(Module.Prefix + "rmvfilterword")
                .Alias(Module.Prefix + "rfw")
                .Description("Removes the word from the list of filtered words" +
-                            " | ;rw poop")
+                            $" | {Prefix}rw poop")
                .Parameter("word", ParameterType.Unparsed)
                .Do(async e =>
                {
@@ -133,7 +133,7 @@ namespace NadekoBot.Modules.Permissions.Commands
             cgb.CreateCommand(Module.Prefix + "lstfilterwords")
                .Alias(Module.Prefix + "lfw")
                .Description("Shows a list of filtered words" +
-                            " | ;lfw")
+                            $" | {Prefix}lfw")
                .Do(async e =>
                {
                    try
@@ -152,7 +152,7 @@ namespace NadekoBot.Modules.Permissions.Commands
 
             cgb.CreateCommand(Module.Prefix + "srvrfilterwords")
                 .Alias(Module.Prefix + "sfw")
-                .Description("Enables or disables automatic deleting of messages containing forbidden words on the server. | ;sfw disable")
+                .Description($"Enables or disables automatic deleting of messages containing forbidden words on the server. | {Prefix}sfw disable")
                 .Parameter("bool")
                 .Do(async e =>
                 {
diff --git a/NadekoBot/Modules/Permissions/PermissionsModule.cs b/NadekoBot/Modules/Permissions/PermissionsModule.cs
index c547bfe5..a201f848 100644
--- a/NadekoBot/Modules/Permissions/PermissionsModule.cs
+++ b/NadekoBot/Modules/Permissions/PermissionsModule.cs
@@ -33,7 +33,7 @@ namespace NadekoBot.Modules.Permissions
 
                 cgb.CreateCommand(Prefix + "permrole")
                     .Alias(Prefix + "pr")
-                    .Description("Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'.")
+                    .Description($"Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'. | `{Prefix}pr role`")
                     .Parameter("role", ParameterType.Unparsed)
                      .Do(async e =>
                      {
@@ -158,7 +158,7 @@ namespace NadekoBot.Modules.Permissions
 
                 cgb.CreateCommand(Prefix + "srvrperms")
                     .Alias(Prefix + "sp")
-                    .Description("Shows banned permissions for this server.")
+                    .Description($"Shows banned permissions for this server. | `{Prefix}sp`")
                     .Do(async e =>
                     {
                         var perms = PermissionsHandler.GetServerPermissions(e.Server);
diff --git a/NadekoBot/Modules/Pokemon/PokemonModule.cs b/NadekoBot/Modules/Pokemon/PokemonModule.cs
index ae3ae0d9..d494fffa 100644
--- a/NadekoBot/Modules/Pokemon/PokemonModule.cs
+++ b/NadekoBot/Modules/Pokemon/PokemonModule.cs
@@ -196,7 +196,7 @@ namespace NadekoBot.Modules.Pokemon
 
                 cgb.CreateCommand(Prefix + "movelist")
                     .Alias(Prefix + "ml")
-                    .Description("Lists the moves you are able to use")
+                    .Description($"Lists the moves you are able to use | `{Prefix}ml`")
                     .Do(async e =>
                     {
                         var userType = GetPokeType(e.User.Id);
@@ -210,7 +210,7 @@ namespace NadekoBot.Modules.Pokemon
                     });
 
                 cgb.CreateCommand(Prefix + "heal")
-                    .Description($"Heals someone. Revives those who fainted. Costs a {NadekoBot.Config.CurrencyName} | {Prefix}heal @someone")
+                    .Description($"Heals someone. Revives those who fainted. Costs a {NadekoBot.Config.CurrencyName} | `{Prefix}heal @someone`")
                     .Parameter("target", ParameterType.Unparsed)
                     .Do(async e =>
                     {
@@ -263,7 +263,7 @@ namespace NadekoBot.Modules.Pokemon
                     });
 
                 cgb.CreateCommand(Prefix + "type")
-                    .Description($"Get the poketype of the target. | {Prefix}type @someone")
+                    .Description($"Get the poketype of the target. | `{Prefix}type @someone`")
                     .Parameter("target", ParameterType.Unparsed)
                     .Do(async e =>
                     {
@@ -282,7 +282,7 @@ namespace NadekoBot.Modules.Pokemon
                     });
 
                 cgb.CreateCommand(Prefix + "settype")
-                    .Description($"Set your poketype. Costs a {NadekoBot.Config.CurrencyName}. | {Prefix}settype fire")
+                    .Description($"Set your poketype. Costs a {NadekoBot.Config.CurrencyName}. | `{Prefix}settype fire`")
                     .Parameter("targetType", ParameterType.Unparsed)
                     .Do(async e =>
                     {
@@ -319,11 +319,11 @@ namespace NadekoBot.Modules.Pokemon
                             DbHandler.Instance.Delete<UserPokeTypes>(Dict[(long)e.User.Id]);
                         }
 
-                        DbHandler.Instance.InsertData(new UserPokeTypes
+                        DbHandler.Instance.Connection.Insert(new UserPokeTypes
                         {
                             UserId = (long)e.User.Id,
                             type = targetType.Name
-                        });
+                        }, typeof(UserPokeTypes));
 
                         //Now for the response
 
diff --git a/NadekoBot/Modules/Searches/Commands/ConverterCommand.cs b/NadekoBot/Modules/Searches/Commands/ConverterCommand.cs
index 2383e718..ada8709a 100644
--- a/NadekoBot/Modules/Searches/Commands/ConverterCommand.cs
+++ b/NadekoBot/Modules/Searches/Commands/ConverterCommand.cs
@@ -32,7 +32,7 @@ namespace NadekoBot.Modules.Searches.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "convert")
-                .Description("Convert quantities from>to. Like `~convert m>km 1000`")
+                .Description($"Convert quantities from>to. | `{Prefix}convert m>km 1000`")
                 .Parameter("from-to", ParameterType.Required)
                 .Parameter("quantity", ParameterType.Optional)
                 .Do(ConvertFunc());
diff --git a/NadekoBot/Modules/Searches/Commands/EvalCommand.cs b/NadekoBot/Modules/Searches/Commands/EvalCommand.cs
index ed469517..0d0108e0 100644
--- a/NadekoBot/Modules/Searches/Commands/EvalCommand.cs
+++ b/NadekoBot/Modules/Searches/Commands/EvalCommand.cs
@@ -17,7 +17,7 @@ namespace NadekoBot.Modules.Searches.Commands
         {
             cgb.CreateCommand(Module.Prefix + "calculate")
                 .Alias(Module.Prefix + "calc")
-                .Description("Evaluate a mathematical expression. | ~calc 1+1")
+                .Description($"Evaluate a mathematical expression. | {Prefix}calc 1+1")
                 .Parameter("expression", ParameterType.Unparsed)
                 .Do(EvalFunc());
         }
diff --git a/NadekoBot/Modules/Searches/Commands/LoLCommands.cs b/NadekoBot/Modules/Searches/Commands/LoLCommands.cs
index 8826beaf..5a5b766a 100644
--- a/NadekoBot/Modules/Searches/Commands/LoLCommands.cs
+++ b/NadekoBot/Modules/Searches/Commands/LoLCommands.cs
@@ -72,7 +72,7 @@ namespace NadekoBot.Modules.Searches.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "lolchamp")
-                  .Description("Shows League Of Legends champion statistics. If there are spaces/apostrophes or in the name - omit them. Optional second parameter is a role. |~lolchamp Riven or ~lolchamp Annie sup")
+                  .Description($"Shows League Of Legends champion statistics. If there are spaces/apostrophes or in the name - omit them. Optional second parameter is a role. |`{Prefix}lolchamp Riven` or `{Prefix}lolchamp Annie sup`")
                   .Parameter("champ", ParameterType.Required)
                   .Parameter("position", ParameterType.Unparsed)
                   .Do(async e =>
@@ -280,7 +280,7 @@ Assists: {general["assists"]}  Ban: {general["banRate"]}%
                   });
 
             cgb.CreateCommand(Module.Prefix + "lolban")
-                  .Description("Shows top 6 banned champions ordered by ban rate. Ban these champions and you will be Plat 5 in no time.")
+                  .Description($"Shows top 6 banned champions ordered by ban rate. Ban these champions and you will be Plat 5 in no time. | `{Prefix}lolban`")
                   .Do(async e =>
                   {
 
diff --git a/NadekoBot/Modules/Searches/Commands/MemegenCommands.cs b/NadekoBot/Modules/Searches/Commands/MemegenCommands.cs
index 5eff7c78..a7d23181 100644
--- a/NadekoBot/Modules/Searches/Commands/MemegenCommands.cs
+++ b/NadekoBot/Modules/Searches/Commands/MemegenCommands.cs
@@ -17,7 +17,7 @@ namespace NadekoBot.Modules.Searches.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Prefix + "memelist")
-                .Description("Pulls a list of memes you can use with `~memegen` from http://memegen.link/templates/")
+                .Description($"Pulls a list of memes you can use with `~memegen` from http://memegen.link/templates/ | `{Prefix}memelist`")
                 .Do(async e =>
                 {
                     int i = 0;
@@ -30,7 +30,7 @@ namespace NadekoBot.Modules.Searches.Commands
                 });
 
             cgb.CreateCommand(Prefix + "memegen")
-                .Description("Generates a meme from memelist with top and bottom text. | `~memegen biw \"gets iced coffee\" \"in the winter\"`")
+                .Description($"Generates a meme from memelist with top and bottom text. | `{Prefix}memegen biw \"gets iced coffee\" \"in the winter\"`")
                 .Parameter("meme", ParameterType.Required)
                 .Parameter("toptext", ParameterType.Required)
                 .Parameter("bottext", ParameterType.Required)
diff --git a/NadekoBot/Modules/Searches/Commands/OsuCommands.cs b/NadekoBot/Modules/Searches/Commands/OsuCommands.cs
index 451e9a13..bda99f48 100644
--- a/NadekoBot/Modules/Searches/Commands/OsuCommands.cs
+++ b/NadekoBot/Modules/Searches/Commands/OsuCommands.cs
@@ -17,7 +17,7 @@ namespace NadekoBot.Modules.Searches.Commands
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "osu")
-                  .Description("Shows osu stats for a player. | `~osu Name` or `~osu Name taiko`")
+                  .Description($"Shows osu stats for a player. | `{Prefix}osu Name` or `{Prefix}osu Name taiko`")
                   .Parameter("usr", ParameterType.Required)
                   .Parameter("mode", ParameterType.Unparsed)
                   .Do(async e =>
@@ -56,7 +56,7 @@ namespace NadekoBot.Modules.Searches.Commands
                   });
 
             cgb.CreateCommand(Module.Prefix + "osu b")
-                .Description("Shows information about an osu beatmap. |~osu b https://osu.ppy.sh/s/127712")
+                .Description($"Shows information about an osu beatmap. |`{Prefix}osu b` https://osu.ppy.sh/s/127712`")
                 .Parameter("map", ParameterType.Unparsed)
                 .Do(async e =>
                 {
@@ -88,7 +88,7 @@ namespace NadekoBot.Modules.Searches.Commands
                 });
 
             cgb.CreateCommand(Module.Prefix + "osu top5")
-                .Description("Displays a user's top 5 plays.  |~osu top5 Name")
+                .Description($"Displays a user's top 5 plays.  |{Prefix}osu top5 Name")
                 .Parameter("usr", ParameterType.Required)
                 .Parameter("mode", ParameterType.Unparsed)
                 .Do(async e =>
diff --git a/NadekoBot/Modules/Searches/Commands/PokemonSearchCommands.cs b/NadekoBot/Modules/Searches/Commands/PokemonSearchCommands.cs
index a171abe9..b2c13dca 100644
--- a/NadekoBot/Modules/Searches/Commands/PokemonSearchCommands.cs
+++ b/NadekoBot/Modules/Searches/Commands/PokemonSearchCommands.cs
@@ -22,7 +22,7 @@ namespace NadekoBot.Modules.Searches.Commands
         {
             cgb.CreateCommand(Prefix + "pokemon")
                 .Alias(Prefix + "poke")
-                .Description("Searches for a pokemon.")
+                .Description($"Searches for a pokemon. | `{Prefix}poke Sylveon`")
                 .Parameter("pokemon", ParameterType.Unparsed)
                 .Do(async e =>
                 {
@@ -43,7 +43,7 @@ namespace NadekoBot.Modules.Searches.Commands
 
             cgb.CreateCommand(Prefix + "pokemonability")
                 .Alias(Prefix + "pokeab")
-                .Description("Searches for a pokemon ability.")
+                .Description($"Searches for a pokemon ability. | `{Prefix}pokeab \"water gun\"`")
                 .Parameter("abil", ParameterType.Unparsed)
                 .Do(async e =>
                 {
diff --git a/NadekoBot/Modules/Searches/Commands/StreamNotifications.cs b/NadekoBot/Modules/Searches/Commands/StreamNotifications.cs
index efe521ff..f8720324 100644
--- a/NadekoBot/Modules/Searches/Commands/StreamNotifications.cs
+++ b/NadekoBot/Modules/Searches/Commands/StreamNotifications.cs
@@ -122,7 +122,7 @@ namespace NadekoBot.Modules.Searches.Commands
             cgb.CreateCommand(Module.Prefix + "hitbox")
                 .Alias(Module.Prefix + "hb")
                 .Description("Notifies this channel when a certain user starts streaming." +
-                             " | ~hitbox SomeStreamer")
+                             $" | `{Prefix}hitbox SomeStreamer`")
                 .Parameter("username", ParameterType.Unparsed)
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(TrackStream(StreamNotificationConfig.StreamType.Hitbox));
@@ -130,7 +130,7 @@ namespace NadekoBot.Modules.Searches.Commands
             cgb.CreateCommand(Module.Prefix + "twitch")
                 .Alias(Module.Prefix + "tw")
                 .Description("Notifies this channel when a certain user starts streaming." +
-                             " | ~twitch SomeStreamer")
+                             $" | `{Prefix}twitch SomeStreamer`")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Parameter("username", ParameterType.Unparsed)
                 .Do(TrackStream(StreamNotificationConfig.StreamType.Twitch));
@@ -138,7 +138,7 @@ namespace NadekoBot.Modules.Searches.Commands
             cgb.CreateCommand(Module.Prefix + "beam")
                 .Alias(Module.Prefix + "bm")
                 .Description("Notifies this channel when a certain user starts streaming." +
-                             " | ~beam SomeStreamer")
+                             $" | `{Prefix}beam SomeStreamer`")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Parameter("username", ParameterType.Unparsed)
                 .Do(TrackStream(StreamNotificationConfig.StreamType.Beam));
@@ -146,7 +146,7 @@ namespace NadekoBot.Modules.Searches.Commands
             cgb.CreateCommand(Module.Prefix + "checkhitbox")
                 .Alias(Module.Prefix + "chhb")
                 .Description("Checks if a certain user is streaming on the hitbox platform." +
-                             " | ~chhb SomeStreamer")
+                             $" | `{Prefix}chhb SomeStreamer`")
                 .Parameter("username", ParameterType.Unparsed)
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Do(async e =>
@@ -175,7 +175,7 @@ namespace NadekoBot.Modules.Searches.Commands
             cgb.CreateCommand(Module.Prefix + "checktwitch")
                 .Alias(Module.Prefix + "chtw")
                 .Description("Checks if a certain user is streaming on the twitch platform." +
-                             " | ~chtw SomeStreamer")
+                             $" | `{Prefix}chtw SomeStreamer`")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Parameter("username", ParameterType.Unparsed)
                 .Do(async e =>
@@ -204,7 +204,7 @@ namespace NadekoBot.Modules.Searches.Commands
             cgb.CreateCommand(Module.Prefix + "checkbeam")
                 .Alias(Module.Prefix + "chbm")
                 .Description("Checks if a certain user is streaming on the beam platform." +
-                             " | ~chbm SomeStreamer")
+                             $" | `{Prefix}chbm SomeStreamer`")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Parameter("username", ParameterType.Unparsed)
                 .Do(async e =>
@@ -233,7 +233,7 @@ namespace NadekoBot.Modules.Searches.Commands
             cgb.CreateCommand(Module.Prefix + "removestream")
                 .Alias(Module.Prefix + "rms")
                 .Description("Removes notifications of a certain streamer on this channel." +
-                             " | ~rms SomeGuy")
+                             $" | `{Prefix}rms SomeGuy`")
                 .AddCheck(SimpleCheckers.ManageServer())
                 .Parameter("username", ParameterType.Unparsed)
                 .Do(async e =>
@@ -261,7 +261,7 @@ namespace NadekoBot.Modules.Searches.Commands
             cgb.CreateCommand(Module.Prefix + "liststreams")
                 .Alias(Module.Prefix + "ls")
                 .Description("Lists all streams you are following on this server." +
-                             " | ~ls")
+                             $" | `{Prefix}ls`")
                 .Do(async e =>
                 {
 
diff --git a/NadekoBot/Modules/Searches/Commands/WowJokes.cs b/NadekoBot/Modules/Searches/Commands/WowJokes.cs
index da2f99ae..b3e67eed 100644
--- a/NadekoBot/Modules/Searches/Commands/WowJokes.cs
+++ b/NadekoBot/Modules/Searches/Commands/WowJokes.cs
@@ -22,7 +22,7 @@ namespace NadekoBot.Modules.Searches.Commands
         {
 
             cgb.CreateCommand(Module.Prefix + "wowjoke")
-                .Description("Get one of Kwoth's penultimate WoW jokes.")
+                .Description($"Get one of Kwoth's penultimate WoW jokes. | `{Prefix}wowjoke`")
                 .Do(async e =>
                 {
                     if (!jokes.Any())
diff --git a/NadekoBot/Modules/Searches/SearchesModule.cs b/NadekoBot/Modules/Searches/SearchesModule.cs
index 45b50c33..84d0c0a1 100644
--- a/NadekoBot/Modules/Searches/SearchesModule.cs
+++ b/NadekoBot/Modules/Searches/SearchesModule.cs
@@ -86,7 +86,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
                 cgb.CreateCommand(Prefix + "ani")
                     .Alias(Prefix + "anime", Prefix + "aq")
                     .Parameter("query", ParameterType.Unparsed)
-                    .Description("Queries anilist for an anime and shows the first result.")
+                    .Description($"Queries anilist for an anime and shows the first result. | `{Prefix}aq aquerion evol`")
                     .Do(async e =>
                     {
                         if (!(await SearchHelper.ValidateQuery(e.Channel, e.GetArg("query")).ConfigureAwait(false))) return;
@@ -341,7 +341,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
                   });
 
                 cgb.CreateCommand(Prefix + "quote")
-                    .Description("Shows a random quote.")
+                    .Description($"Shows a random quote. | `{Prefix}quote`")
                     .Do(async e =>
                     {
                         var quote = NadekoBot.Config.Quotes[rng.Next(0, NadekoBot.Config.Quotes.Count)].ToString();
@@ -349,7 +349,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
                     });
 
                 cgb.CreateCommand(Prefix + "catfact")
-                    .Description("Shows a random catfact from <http://catfacts-api.appspot.com/api/facts>")
+                    .Description($"Shows a random catfact from <http://catfacts-api.appspot.com/api/facts> | `{Prefix}catfact`")
                     .Do(async e =>
                     {
                         var response = await SearchHelper.GetResponseStringAsync("http://catfacts-api.appspot.com/api/facts").ConfigureAwait(false);
@@ -360,7 +360,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
 
                 cgb.CreateCommand(Prefix + "yomama")
                     .Alias(Prefix + "ym")
-                    .Description("Shows a random joke from <http://api.yomomma.info/>")
+                    .Description($"Shows a random joke from <http://api.yomomma.info/> | `{Prefix}ym`")
                     .Do(async e =>
                     {
                         var response = await SearchHelper.GetResponseStringAsync("http://api.yomomma.info/").ConfigureAwait(false);
@@ -369,7 +369,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
 
                 cgb.CreateCommand(Prefix + "randjoke")
                     .Alias(Prefix + "rj")
-                    .Description("Shows a random joke from <http://tambal.azurewebsites.net/joke/random>")
+                    .Description($"Shows a random joke from <http://tambal.azurewebsites.net/joke/random> | `{Prefix}rj`")
                     .Do(async e =>
                     {
                         var response = await SearchHelper.GetResponseStringAsync("http://tambal.azurewebsites.net/joke/random").ConfigureAwait(false);
@@ -378,7 +378,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
 
                 cgb.CreateCommand(Prefix + "chucknorris")
                     .Alias(Prefix + "cn")
-                    .Description("Shows a random chucknorris joke from <http://tambal.azurewebsites.net/joke/random>")
+                    .Description($"Shows a random chucknorris joke from <http://tambal.azurewebsites.net/joke/random> | `{Prefix}cn`")
                     .Do(async e =>
                     {
                         var response = await SearchHelper.GetResponseStringAsync("http://api.icndb.com/jokes/random/").ConfigureAwait(false);
@@ -387,7 +387,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
 
                 cgb.CreateCommand(Prefix + "magicitem")
                     .Alias(Prefix + "mi")
-                    .Description("Shows a random magicitem from <https://1d4chan.org/wiki/List_of_/tg/%27s_magic_items>")
+                    .Description($"Shows a random magicitem from <https://1d4chan.org/wiki/List_of_/tg/%27s_magic_items> | `{Prefix}mi`")
                     .Do(async e =>
                     {
                         var magicItems = JsonConvert.DeserializeObject<List<MagicItem>>(File.ReadAllText("data/magicitems.json"));
@@ -397,7 +397,7 @@ $@"🌍 **Weather for** 【{obj["target"]}】
                     });
 
                 cgb.CreateCommand(Prefix + "revav")
-                    .Description($"Returns a google reverse image search for someone's avatar. | `{Prefix}revav \"@SomeGuy\"")
+                    .Description($"Returns a google reverse image search for someone's avatar. | `{Prefix}revav \"@SomeGuy\"`")
                     .Parameter("user", ParameterType.Unparsed)
                     .Do(async e =>
                     {
diff --git a/NadekoBot/Modules/Translator/ValidLanguagesCommand.cs b/NadekoBot/Modules/Translator/ValidLanguagesCommand.cs
index ede25f13..438e77de 100644
--- a/NadekoBot/Modules/Translator/ValidLanguagesCommand.cs
+++ b/NadekoBot/Modules/Translator/ValidLanguagesCommand.cs
@@ -13,7 +13,7 @@ namespace NadekoBot.Modules.Translator
         internal override void Init(CommandGroupBuilder cgb)
         {
             cgb.CreateCommand(Module.Prefix + "translangs")
-                .Description("List the valid languages for translation.")
+                .Description($"List the valid languages for translation. | `{Prefix}translangs` or `{Prefix}translangs language`")
                 .Parameter("search", ParameterType.Optional)
                 .Do(ListLanguagesFunc());
         }
diff --git a/NadekoBot/Modules/Trello/TrelloModule.cs b/NadekoBot/Modules/Trello/TrelloModule.cs
index b144a2cf..14938aca 100644
--- a/NadekoBot/Modules/Trello/TrelloModule.cs
+++ b/NadekoBot/Modules/Trello/TrelloModule.cs
@@ -92,7 +92,7 @@ namespace NadekoBot.Modules.Trello
                     });
 
                 cgb.CreateCommand(Prefix + "unbind")
-                    .Description("Unbinds a bot from the channel and board.")
+                    .Description($"Unbinds a bot from the channel and board. | `{Prefix}unbind`")
                     .Do(async e =>
                     {
                         if (!NadekoBot.IsOwner(e.User.Id)) return;
@@ -106,7 +106,7 @@ namespace NadekoBot.Modules.Trello
 
                 cgb.CreateCommand(Prefix + "lists")
                     .Alias(Prefix + "list")
-                    .Description("Lists all lists yo ;)")
+                    .Description($"Lists all lists yo ;) | {Prefix}list")
                     .Do(async e =>
                     {
                         if (!NadekoBot.IsOwner(e.User.Id)) return;
diff --git a/NadekoBot/Modules/Utility/Commands/InfoCommands.cs b/NadekoBot/Modules/Utility/Commands/InfoCommands.cs
index 7d14a16f..da1bcd0c 100644
--- a/NadekoBot/Modules/Utility/Commands/InfoCommands.cs
+++ b/NadekoBot/Modules/Utility/Commands/InfoCommands.cs
@@ -18,7 +18,7 @@ namespace NadekoBot.Modules.Utility.Commands
         {
             cgb.CreateCommand(Module.Prefix + "serverinfo")
                 .Alias(Module.Prefix + "sinfo")
-                .Description($"Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. |{Module.Prefix}sinfo Some Server")
+                .Description($"Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. |`{Module.Prefix}sinfo Some Server`")
                 .Parameter("server", ParameterType.Optional)
                 .Do(async e =>
                 {
@@ -49,7 +49,7 @@ namespace NadekoBot.Modules.Utility.Commands
 
             cgb.CreateCommand(Module.Prefix + "channelinfo")
                 .Alias(Module.Prefix + "cinfo")
-                .Description($"Shows info about the channel. If no channel is supplied, it defaults to current one. |{Module.Prefix}cinfo #some-channel")
+                .Description($"Shows info about the channel. If no channel is supplied, it defaults to current one. |`{Module.Prefix}cinfo #some-channel`")
                 .Parameter("channel", ParameterType.Optional)
                 .Do(async e =>
                 {
@@ -71,7 +71,7 @@ namespace NadekoBot.Modules.Utility.Commands
 
             cgb.CreateCommand(Module.Prefix + "userinfo")
                 .Alias(Module.Prefix + "uinfo")
-                .Description($"Shows info about the user. If no user is supplied, it defaults a user running the command. |{Module.Prefix}uinfo @SomeUser")
+                .Description($"Shows info about the user. If no user is supplied, it defaults a user running the command. |`{Module.Prefix}uinfo @SomeUser`")
                 .Parameter("user", ParameterType.Optional)
                 .Do(async e =>
                 {
diff --git a/NadekoBot/Modules/Utility/Commands/Remind.cs b/NadekoBot/Modules/Utility/Commands/Remind.cs
index dabd4158..808f4b11 100644
--- a/NadekoBot/Modules/Utility/Commands/Remind.cs
+++ b/NadekoBot/Modules/Utility/Commands/Remind.cs
@@ -88,7 +88,7 @@ namespace NadekoBot.Modules.Utility.Commands
                 .Description("Sends a message to you or a channel after certain amount of time. " +
                              "First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. " +
                              "Third argument is a (multiword)message. " +
-                             " | `.remind me 1d5h Do something` or `.remind #general Start now!`")
+                             $" | `{Prefix}remind me 1d5h Do something` or `{Prefix}remind #general Start now!`")
                 .Parameter("meorchannel", ParameterType.Required)
                 .Parameter("time", ParameterType.Required)
                 .Parameter("message", ParameterType.Unparsed)
@@ -171,7 +171,7 @@ namespace NadekoBot.Modules.Utility.Commands
                         UserId = (long)e.User.Id,
                         ServerId = (long)e.Server.Id
                     };
-                    DbHandler.Instance.InsertData(rem);
+                    DbHandler.Instance.Connection.Insert(rem);
 
                     reminders.Add(StartNewReminder(rem));
 
@@ -180,7 +180,7 @@ namespace NadekoBot.Modules.Utility.Commands
             cgb.CreateCommand(Module.Prefix + "remindmsg")
                 .Description("Sets message for when the remind is triggered. " +
                     " Available placeholders are %user% - user who ran the command, %message% -" +
-                    " Message specified in the remind, %target% - target channel of the remind. **Bot Owner Only!**")
+                    $" Message specified in the remind, %target% - target channel of the remind. **Bot Owner Only!** | `{Prefix}remindmsg do something else`")
                 .Parameter("msg", ParameterType.Unparsed)
                 .AddCheck(SimpleCheckers.OwnerOnly())
                 .Do(async e =>
diff --git a/NadekoBot/Modules/Utility/UtilityModule.cs b/NadekoBot/Modules/Utility/UtilityModule.cs
index bd172c08..6fd8db53 100644
--- a/NadekoBot/Modules/Utility/UtilityModule.cs
+++ b/NadekoBot/Modules/Utility/UtilityModule.cs
@@ -87,7 +87,7 @@ namespace NadekoBot.Modules.Utility
                     });
 
                 cgb.CreateCommand(Prefix + "checkmyperms")
-                    .Description("Checks your userspecific permissions on this channel.")
+                    .Description($"Checks your userspecific permissions on this channel. | `{Prefix}checkmyperms`")
                     .Do(async e =>
                     {
                         var output = "```\n";
@@ -100,21 +100,21 @@ namespace NadekoBot.Modules.Utility
                     });
 
                 cgb.CreateCommand(Prefix + "stats")
-                    .Description("Shows some basic stats for Nadeko.")
+                    .Description($"Shows some basic stats for Nadeko. | `{Prefix}stats`")
                     .Do(async e =>
                     {
                         await e.Channel.SendMessage(await NadekoStats.Instance.GetStats()).ConfigureAwait(false);
                     });
 
                 cgb.CreateCommand(Prefix + "dysyd")
-                    .Description("Shows some basic stats for Nadeko.")
+                    .Description($"Shows some basic stats for Nadeko. | `{Prefix}dysyd`")
                     .Do(async e =>
                     {
                         await e.Channel.SendMessage((await NadekoStats.Instance.GetStats()).Matrix().TrimTo(1990)).ConfigureAwait(false);
                     });
 
                 cgb.CreateCommand(Prefix + "userid").Alias(Prefix + "uid")
-                    .Description($"Shows user ID. | `{Prefix}uid` or `{Prefix}uid \"@SomeGuy\"")
+                    .Description($"Shows user ID. | `{Prefix}uid` or `{Prefix}uid \"@SomeGuy\"`")
                     .Parameter("user", ParameterType.Unparsed)
                     .Do(async e =>
                     {
diff --git a/NadekoBot/NadekoBot.cs b/NadekoBot/NadekoBot.cs
index ad68beca..a1299d97 100644
--- a/NadekoBot/NadekoBot.cs
+++ b/NadekoBot/NadekoBot.cs
@@ -117,7 +117,7 @@ namespace NadekoBot
             Client = new DiscordClient(new DiscordConfigBuilder()
             {
                 MessageCacheSize = 10,
-                ConnectionTimeout = 120000,
+                ConnectionTimeout = 180000,
                 LogLevel = LogSeverity.Warning,
                 LogHandler = (s, e) =>
                     Console.WriteLine($"Severity: {e.Severity}" +
@@ -197,7 +197,7 @@ namespace NadekoBot
                     return;
                 }
 #if NADEKO_RELEASE
-                await Task.Delay(100000).ConfigureAwait(false);
+                await Task.Delay(120000).ConfigureAwait(false);
 #else
                 await Task.Delay(1000).ConfigureAwait(false);
 #endif
diff --git a/NadekoBot/NadekoBot.csproj b/NadekoBot/NadekoBot.csproj
index bc22b90f..d332dad2 100644
--- a/NadekoBot/NadekoBot.csproj
+++ b/NadekoBot/NadekoBot.csproj
@@ -161,8 +161,23 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>lib\ScaredFingers.UnitsConversion.dll</HintPath>
     </Reference>
+    <Reference Include="SQLite-net, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\sqlite-net-pcl.1.1.2\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLite-net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCL.batteries, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCL.bundle_green.0.9.2\lib\net45\SQLitePCL.batteries.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCL.raw, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCL.raw.0.9.2\lib\net45\SQLitePCL.raw.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="SQLitePCLPlugin_esqlite3, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\SQLitePCL.plugin.sqlite3.net45.0.9.2\lib\net45\SQLitePCLPlugin_esqlite3.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -202,6 +217,7 @@
     <Compile Include="Modules\Searches\Commands\OsuCommands.cs" />
     <Compile Include="Modules\Searches\Commands\PokemonSearchCommands.cs" />
     <Compile Include="Modules\Utility\UtilityModule.cs" />
+    <Compile Include="_Models\DataModels\TestDataModel.cs" />
     <Compile Include="_Models\DataModels\Incident.cs" />
     <Compile Include="_Models\JSONModels\AnimeResult.cs" />
     <Compile Include="_Models\JSONModels\Configuration.cs" />
@@ -215,6 +231,7 @@
     <Compile Include="Modules\Music\Classes\MusicControls.cs" />
     <Compile Include="Modules\Music\Classes\PoopyBuffer.cs" />
     <Compile Include="Modules\Music\Classes\Song.cs" />
+	<Compile Include="Modules\Music\Classes\SongBuffer.cs" />
     <Compile Include="Modules\Music\Classes\SoundCloud.cs" />
     <Compile Include="Modules\Permissions\Classes\PermissionChecker.cs" />
     <Compile Include="Modules\Permissions\Classes\PermissionHelper.cs" />
@@ -264,7 +281,6 @@
     <Compile Include="Modules\Gambling\DrawCommand.cs" />
     <Compile Include="Modules\Gambling\FlipCoinCommand.cs" />
     <Compile Include="Modules\Help\Commands\HelpCommand.cs" />
-    <Compile Include="Modules\Administration\Commands\VoiceNotificationCommand.cs" />
     <Compile Include="Modules\Administration\Commands\VoicePlusTextCommand.cs" />
     <Compile Include="Modules\Administration\AdministrationModule.cs" />
     <Compile Include="Modules\Conversations\Conversations.cs" />
@@ -296,8 +312,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="Classes\NadekoStats.cs" />
-    <Compile Include="SQLite.cs" />
-    <Compile Include="SQLiteAsync.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -550,6 +564,13 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\SQLitePCL.native.sqlite3.v110_xp.0.9.2\build\SQLitePCL.native.sqlite3.v110_xp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLitePCL.native.sqlite3.v110_xp.0.9.2\build\SQLitePCL.native.sqlite3.v110_xp.targets'))" />
+  </Target>
+  <Import Project="..\packages\SQLitePCL.native.sqlite3.v110_xp.0.9.2\build\SQLitePCL.native.sqlite3.v110_xp.targets" Condition="Exists('..\packages\SQLitePCL.native.sqlite3.v110_xp.0.9.2\build\SQLitePCL.native.sqlite3.v110_xp.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/NadekoBot/SQLite.cs b/NadekoBot/SQLite.cs
deleted file mode 100644
index e74447f6..00000000
--- a/NadekoBot/SQLite.cs
+++ /dev/null
@@ -1,3278 +0,0 @@
-//
-// Copyright (c) 2009-2012 Krueger Systems, Inc.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-#if WINDOWS_PHONE && !USE_WP8_NATIVE_SQLITE
-#define USE_CSHARP_SQLITE
-#endif
-
-using System;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
-
-#if USE_CSHARP_SQLITE
-using Sqlite3 = Community.CsharpSqlite.Sqlite3;
-using Sqlite3DatabaseHandle = Community.CsharpSqlite.Sqlite3.sqlite3;
-using Sqlite3Statement = Community.CsharpSqlite.Sqlite3.Vdbe;
-#elif USE_WP8_NATIVE_SQLITE
-using Sqlite3 = Sqlite.Sqlite3;
-using Sqlite3DatabaseHandle = Sqlite.Database;
-using Sqlite3Statement = Sqlite.Statement;
-#else
-using Sqlite3DatabaseHandle = System.IntPtr;
-using Sqlite3Statement = System.IntPtr;
-#endif
-
-namespace SQLite
-{
-	public class SQLiteException : Exception
-	{
-		public SQLite3.Result Result { get; private set; }
-
-		protected SQLiteException (SQLite3.Result r,string message) : base(message)
-		{
-			Result = r;
-		}
-
-		public static SQLiteException New (SQLite3.Result r, string message)
-		{
-			return new SQLiteException (r, message);
-		}
-	}
-
-	public class NotNullConstraintViolationException : SQLiteException
-	{
-		public IEnumerable<TableMapping.Column> Columns { get; protected set; }
-
-		protected NotNullConstraintViolationException (SQLite3.Result r, string message)
-			: this (r, message, null, null)
-		{
-
-		}
-
-		protected NotNullConstraintViolationException (SQLite3.Result r, string message, TableMapping mapping, object obj)
-			: base (r, message)
-		{
-			if (mapping != null && obj != null) {
-				this.Columns = from c in mapping.Columns
-							   where c.IsNullable == false && c.GetValue (obj) == null
-							   select c;
-			}
-		}
-
-		public static new NotNullConstraintViolationException New (SQLite3.Result r, string message)
-		{
-			return new NotNullConstraintViolationException (r, message);
-		}
-
-		public static NotNullConstraintViolationException New (SQLite3.Result r, string message, TableMapping mapping, object obj)
-		{
-			return new NotNullConstraintViolationException (r, message, mapping, obj);
-		}
-
-		public static NotNullConstraintViolationException New (SQLiteException exception, TableMapping mapping, object obj)
-		{
-			return new NotNullConstraintViolationException (exception.Result, exception.Message, mapping, obj);
-		}
-	}
-
-	[Flags]
-	public enum SQLiteOpenFlags {
-		ReadOnly = 1, ReadWrite = 2, Create = 4,
-		NoMutex = 0x8000, FullMutex = 0x10000,
-		SharedCache = 0x20000, PrivateCache = 0x40000,
-		ProtectionComplete = 0x00100000,
-		ProtectionCompleteUnlessOpen = 0x00200000,
-		ProtectionCompleteUntilFirstUserAuthentication = 0x00300000,
-		ProtectionNone = 0x00400000
-	}
-
-    [Flags]
-    public enum CreateFlags
-    {
-        None = 0,
-        ImplicitPK = 1,    // create a primary key for field called 'Id' (Orm.ImplicitPkName)
-        ImplicitIndex = 2, // create an index for fields ending in 'Id' (Orm.ImplicitIndexSuffix)
-        AllImplicit = 3,   // do both above
-
-        AutoIncPK = 4      // force PK field to be auto inc
-    }
-
-	/// <summary>
-	/// Represents an open connection to a SQLite database.
-	/// </summary>
-	public partial class SQLiteConnection : IDisposable
-	{
-		private bool _open;
-		private TimeSpan _busyTimeout;
-		private Dictionary<string, TableMapping> _mappings = null;
-		private Dictionary<string, TableMapping> _tables = null;
-		private System.Diagnostics.Stopwatch _sw;
-		private long _elapsedMilliseconds = 0;
-
-		private int _transactionDepth = 0;
-		private Random _rand = new Random ();
-
-		public Sqlite3DatabaseHandle Handle { get; private set; }
-		internal static readonly Sqlite3DatabaseHandle NullHandle = default(Sqlite3DatabaseHandle);
-
-		public string DatabasePath { get; private set; }
-
-		public bool TimeExecution { get; set; }
-
-		public bool Trace { get; set; }
-
-		public bool StoreDateTimeAsTicks { get; private set; }
-
-		/// <summary>
-		/// Constructs a new SQLiteConnection and opens a SQLite database specified by databasePath.
-		/// </summary>
-		/// <param name="databasePath">
-		/// Specifies the path to the database file.
-		/// </param>
-		/// <param name="storeDateTimeAsTicks">
-		/// Specifies whether to store DateTime properties as ticks (true) or strings (false). You
-		/// absolutely do want to store them as Ticks in all new projects. The default of false is
-		/// only here for backwards compatibility. There is a *significant* speed advantage, with no
-		/// down sides, when setting storeDateTimeAsTicks = true.
-		/// </param>
-		public SQLiteConnection (string databasePath, bool storeDateTimeAsTicks = false)
-			: this (databasePath, SQLiteOpenFlags.ReadWrite | SQLiteOpenFlags.Create, storeDateTimeAsTicks)
-		{
-		}
-
-		/// <summary>
-		/// Constructs a new SQLiteConnection and opens a SQLite database specified by databasePath.
-		/// </summary>
-		/// <param name="databasePath">
-		/// Specifies the path to the database file.
-		/// </param>
-		/// <param name="storeDateTimeAsTicks">
-		/// Specifies whether to store DateTime properties as ticks (true) or strings (false). You
-		/// absolutely do want to store them as Ticks in all new projects. The default of false is
-		/// only here for backwards compatibility. There is a *significant* speed advantage, with no
-		/// down sides, when setting storeDateTimeAsTicks = true.
-		/// </param>
-		public SQLiteConnection (string databasePath, SQLiteOpenFlags openFlags, bool storeDateTimeAsTicks = false)
-		{
-			if (string.IsNullOrEmpty (databasePath))
-				throw new ArgumentException ("Must be specified", "databasePath");
-
-			DatabasePath = databasePath;
-
-#if NETFX_CORE
-			SQLite3.SetDirectory(/*temp directory type*/2, Windows.Storage.ApplicationData.Current.TemporaryFolder.Path);
-#endif
-
-			Sqlite3DatabaseHandle handle;
-
-#if SILVERLIGHT || USE_CSHARP_SQLITE
-            var r = SQLite3.Open (databasePath, out handle, (int)openFlags, IntPtr.Zero);
-#else
-			// open using the byte[]
-			// in the case where the path may include Unicode
-			// force open to using UTF-8 using sqlite3_open_v2
-			var databasePathAsBytes = GetNullTerminatedUtf8 (DatabasePath);
-			var r = SQLite3.Open (databasePathAsBytes, out handle, (int) openFlags, IntPtr.Zero);
-#endif
-
-			Handle = handle;
-			if (r != SQLite3.Result.OK) {
-				throw SQLiteException.New (r, String.Format ("Could not open database file: {0} ({1})", DatabasePath, r));
-			}
-			_open = true;
-
-			StoreDateTimeAsTicks = storeDateTimeAsTicks;
-			
-			BusyTimeout = TimeSpan.FromSeconds (0.1);
-		}
-		
-		static SQLiteConnection ()
-		{
-			if (_preserveDuringLinkMagic) {
-				var ti = new ColumnInfo ();
-				ti.Name = "magic";
-			}
-		}
-
-        public void EnableLoadExtension(int onoff)
-        {
-            SQLite3.Result r = SQLite3.EnableLoadExtension(Handle, onoff);
-			if (r != SQLite3.Result.OK) {
-				string msg = SQLite3.GetErrmsg (Handle);
-				throw SQLiteException.New (r, msg);
-			}
-        }
-
-		static byte[] GetNullTerminatedUtf8 (string s)
-		{
-			var utf8Length = System.Text.Encoding.UTF8.GetByteCount (s);
-			var bytes = new byte [utf8Length + 1];
-			utf8Length = System.Text.Encoding.UTF8.GetBytes(s, 0, s.Length, bytes, 0);
-			return bytes;
-		}
-		
-		/// <summary>
-		/// Used to list some code that we want the MonoTouch linker
-		/// to see, but that we never want to actually execute.
-		/// </summary>
-		static bool _preserveDuringLinkMagic;
-
-		/// <summary>
-		/// Sets a busy handler to sleep the specified amount of time when a table is locked.
-		/// The handler will sleep multiple times until a total time of <see cref="BusyTimeout"/> has accumulated.
-		/// </summary>
-		public TimeSpan BusyTimeout {
-			get { return _busyTimeout; }
-			set {
-				_busyTimeout = value;
-				if (Handle != NullHandle) {
-					SQLite3.BusyTimeout (Handle, (int)_busyTimeout.TotalMilliseconds);
-				}
-			}
-		}
-
-		/// <summary>
-		/// Returns the mappings from types to tables that the connection
-		/// currently understands.
-		/// </summary>
-		public IEnumerable<TableMapping> TableMappings {
-			get {
-				return _tables != null ? _tables.Values : Enumerable.Empty<TableMapping> ();
-			}
-		}
-
-		/// <summary>
-		/// Retrieves the mapping that is automatically generated for the given type.
-		/// </summary>
-		/// <param name="type">
-		/// The type whose mapping to the database is returned.
-		/// </param>         
-        /// <param name="createFlags">
-		/// Optional flags allowing implicit PK and indexes based on naming conventions
-		/// </param>     
-		/// <returns>
-		/// The mapping represents the schema of the columns of the database and contains 
-		/// methods to set and get properties of objects.
-		/// </returns>
-        public TableMapping GetMapping(Type type, CreateFlags createFlags = CreateFlags.None)
-		{
-			if (_mappings == null) {
-				_mappings = new Dictionary<string, TableMapping> ();
-			}
-			TableMapping map;
-			if (!_mappings.TryGetValue (type.FullName, out map)) {
-				map = new TableMapping (type, createFlags);
-				_mappings [type.FullName] = map;
-			}
-			return map;
-		}
-		
-		/// <summary>
-		/// Retrieves the mapping that is automatically generated for the given type.
-		/// </summary>
-		/// <returns>
-		/// The mapping represents the schema of the columns of the database and contains 
-		/// methods to set and get properties of objects.
-		/// </returns>
-		public TableMapping GetMapping<T> ()
-		{
-			return GetMapping (typeof (T));
-		}
-
-		private struct IndexedColumn
-		{
-			public int Order;
-			public string ColumnName;
-		}
-
-		private struct IndexInfo
-		{
-			public string IndexName;
-			public string TableName;
-			public bool Unique;
-			public List<IndexedColumn> Columns;
-		}
-
-		/// <summary>
-		/// Executes a "drop table" on the database.  This is non-recoverable.
-		/// </summary>
-		public int DropTable<T>()
-		{
-			var map = GetMapping (typeof (T));
-
-			var query = string.Format("drop table if exists \"{0}\"", map.TableName);
-
-			return Execute (query);
-		}
-		
-		/// <summary>
-		/// Executes a "create table if not exists" on the database. It also
-		/// creates any specified indexes on the columns of the table. It uses
-		/// a schema automatically generated from the specified type. You can
-		/// later access this schema by calling GetMapping.
-		/// </summary>
-		/// <returns>
-		/// The number of entries added to the database schema.
-		/// </returns>
-		public int CreateTable<T>(CreateFlags createFlags = CreateFlags.None)
-		{
-			return CreateTable(typeof (T), createFlags);
-		}
-
-		/// <summary>
-		/// Executes a "create table if not exists" on the database. It also
-		/// creates any specified indexes on the columns of the table. It uses
-		/// a schema automatically generated from the specified type. You can
-		/// later access this schema by calling GetMapping.
-		/// </summary>
-		/// <param name="ty">Type to reflect to a database table.</param>
-        /// <param name="createFlags">Optional flags allowing implicit PK and indexes based on naming conventions.</param>  
-		/// <returns>
-		/// The number of entries added to the database schema.
-		/// </returns>
-        public int CreateTable(Type ty, CreateFlags createFlags = CreateFlags.None)
-		{
-			if (_tables == null) {
-				_tables = new Dictionary<string, TableMapping> ();
-			}
-			TableMapping map;
-			if (!_tables.TryGetValue (ty.FullName, out map)) {
-				map = GetMapping (ty, createFlags);
-				_tables.Add (ty.FullName, map);
-			}
-			var query = "create table if not exists \"" + map.TableName + "\"(\n";
-			
-			var decls = map.Columns.Select (p => Orm.SqlDecl (p, StoreDateTimeAsTicks));
-			var decl = string.Join (",\n", decls.ToArray ());
-			query += decl;
-			query += ")";
-			
-			var count = Execute (query);
-			
-			if (count == 0) { //Possible bug: This always seems to return 0?
-				// Table already exists, migrate it
-				MigrateTable (map);
-			}
-
-			var indexes = new Dictionary<string, IndexInfo> ();
-			foreach (var c in map.Columns) {
-				foreach (var i in c.Indices) {
-					var iname = i.Name ?? map.TableName + "_" + c.Name;
-					IndexInfo iinfo;
-					if (!indexes.TryGetValue (iname, out iinfo)) {
-						iinfo = new IndexInfo {
-							IndexName = iname,
-							TableName = map.TableName,
-							Unique = i.Unique,
-							Columns = new List<IndexedColumn> ()
-						};
-						indexes.Add (iname, iinfo);
-					}
-
-					if (i.Unique != iinfo.Unique)
-						throw new Exception ("All the columns in an index must have the same value for their Unique property");
-
-					iinfo.Columns.Add (new IndexedColumn {
-						Order = i.Order,
-						ColumnName = c.Name
-					});
-				}
-			}
-
-			foreach (var indexName in indexes.Keys) {
-				var index = indexes[indexName];
-				var columns = index.Columns.OrderBy(i => i.Order).Select(i => i.ColumnName).ToArray();
-                count += CreateIndex(indexName, index.TableName, columns, index.Unique);
-			}
-			
-			return count;
-		}
-
-        /// <summary>
-        /// Creates an index for the specified table and columns.
-        /// </summary>
-        /// <param name="indexName">Name of the index to create</param>
-        /// <param name="tableName">Name of the database table</param>
-        /// <param name="columnNames">An array of column names to index</param>
-        /// <param name="unique">Whether the index should be unique</param>
-        public int CreateIndex(string indexName, string tableName, string[] columnNames, bool unique = false)
-        {
-            const string sqlFormat = "create {2} index if not exists \"{3}\" on \"{0}\"(\"{1}\")";
-            var sql = String.Format(sqlFormat, tableName, string.Join ("\", \"", columnNames), unique ? "unique" : "", indexName);
-            return Execute(sql);
-        }
-
-        /// <summary>
-        /// Creates an index for the specified table and column.
-        /// </summary>
-        /// <param name="indexName">Name of the index to create</param>
-        /// <param name="tableName">Name of the database table</param>
-        /// <param name="columnName">Name of the column to index</param>
-        /// <param name="unique">Whether the index should be unique</param>
-        public int CreateIndex(string indexName, string tableName, string columnName, bool unique = false)
-        {
-            return CreateIndex(indexName, tableName, new string[] { columnName }, unique);
-        }
-        
-        /// <summary>
-        /// Creates an index for the specified table and column.
-        /// </summary>
-        /// <param name="tableName">Name of the database table</param>
-        /// <param name="columnName">Name of the column to index</param>
-        /// <param name="unique">Whether the index should be unique</param>
-        public int CreateIndex(string tableName, string columnName, bool unique = false)
-        {
-            return CreateIndex(tableName + "_" + columnName, tableName, columnName, unique);
-        }
-
-        /// <summary>
-        /// Creates an index for the specified table and columns.
-        /// </summary>
-        /// <param name="tableName">Name of the database table</param>
-        /// <param name="columnNames">An array of column names to index</param>
-        /// <param name="unique">Whether the index should be unique</param>
-        public int CreateIndex(string tableName, string[] columnNames, bool unique = false)
-        {
-            return CreateIndex(tableName + "_" + string.Join ("_", columnNames), tableName, columnNames, unique);
-        }
-
-        /// <summary>
-        /// Creates an index for the specified object property.
-        /// e.g. CreateIndex<Client>(c => c.Name);
-        /// </summary>
-        /// <typeparam name="T">Type to reflect to a database table.</typeparam>
-        /// <param name="property">Property to index</param>
-        /// <param name="unique">Whether the index should be unique</param>
-        public void CreateIndex<T>(Expression<Func<T, object>> property, bool unique = false)
-        {
-            MemberExpression mx;
-            if (property.Body.NodeType == ExpressionType.Convert)
-            {
-                mx = ((UnaryExpression)property.Body).Operand as MemberExpression;
-            }
-            else
-            {
-                mx= (property.Body as MemberExpression);
-            }
-            var propertyInfo = mx.Member as PropertyInfo;
-            if (propertyInfo == null)
-            {
-                throw new ArgumentException("The lambda expression 'property' should point to a valid Property");
-            }
-
-            var propName = propertyInfo.Name;
-
-            var map = GetMapping<T>();
-            var colName = map.FindColumnWithPropertyName(propName).Name;
-
-            CreateIndex(map.TableName, colName, unique);
-        }
-
-		public class ColumnInfo
-		{
-//			public int cid { get; set; }
-
-			[Column ("name")]
-			public string Name { get; set; }
-
-//			[Column ("type")]
-//			public string ColumnType { get; set; }
-
-			public int notnull { get; set; }
-
-//			public string dflt_value { get; set; }
-
-//			public int pk { get; set; }
-
-			public override string ToString ()
-			{
-				return Name;
-			}
-		}
-
-		public List<ColumnInfo> GetTableInfo (string tableName)
-		{
-			var query = "pragma table_info(\"" + tableName + "\")";			
-			return Query<ColumnInfo> (query);
-		}
-
-		void MigrateTable (TableMapping map)
-		{
-			var existingCols = GetTableInfo (map.TableName);
-			
-			var toBeAdded = new List<TableMapping.Column> ();
-			
-			foreach (var p in map.Columns) {
-				var found = false;
-				foreach (var c in existingCols) {
-					found = (string.Compare (p.Name, c.Name, StringComparison.OrdinalIgnoreCase) == 0);
-					if (found)
-						break;
-				}
-				if (!found) {
-					toBeAdded.Add (p);
-				}
-			}
-			
-			foreach (var p in toBeAdded) {
-				var addCol = "alter table \"" + map.TableName + "\" add column " + Orm.SqlDecl (p, StoreDateTimeAsTicks);
-				Execute (addCol);
-			}
-		}
-
-		/// <summary>
-		/// Creates a new SQLiteCommand. Can be overridden to provide a sub-class.
-		/// </summary>
-		/// <seealso cref="SQLiteCommand.OnInstanceCreated"/>
-		protected virtual SQLiteCommand NewCommand ()
-		{
-			return new SQLiteCommand (this);
-		}
-
-		/// <summary>
-		/// Creates a new SQLiteCommand given the command text with arguments. Place a '?'
-		/// in the command text for each of the arguments.
-		/// </summary>
-		/// <param name="cmdText">
-		/// The fully escaped SQL.
-		/// </param>
-		/// <param name="args">
-		/// Arguments to substitute for the occurences of '?' in the command text.
-		/// </param>
-		/// <returns>
-		/// A <see cref="SQLiteCommand"/>
-		/// </returns>
-		public SQLiteCommand CreateCommand (string cmdText, params object[] ps)
-		{
-			if (!_open)
-				throw SQLiteException.New (SQLite3.Result.Error, "Cannot create commands from unopened database");
-
-			var cmd = NewCommand ();
-			cmd.CommandText = cmdText;
-			foreach (var o in ps) {
-				cmd.Bind (o);
-			}
-			return cmd;
-		}
-
-		/// <summary>
-		/// Creates a SQLiteCommand given the command text (SQL) with arguments. Place a '?'
-		/// in the command text for each of the arguments and then executes that command.
-		/// Use this method instead of Query when you don't expect rows back. Such cases include
-		/// INSERTs, UPDATEs, and DELETEs.
-		/// You can set the Trace or TimeExecution properties of the connection
-		/// to profile execution.
-		/// </summary>
-		/// <param name="query">
-		/// The fully escaped SQL.
-		/// </param>
-		/// <param name="args">
-		/// Arguments to substitute for the occurences of '?' in the query.
-		/// </param>
-		/// <returns>
-		/// The number of rows modified in the database as a result of this execution.
-		/// </returns>
-		public int Execute (string query, params object[] args)
-		{
-			var cmd = CreateCommand (query, args);
-			
-			if (TimeExecution) {
-				if (_sw == null) {
-					_sw = new Stopwatch ();
-				}
-				_sw.Reset ();
-				_sw.Start ();
-			}
-
-			var r = cmd.ExecuteNonQuery ();
-			
-			if (TimeExecution) {
-				_sw.Stop ();
-				_elapsedMilliseconds += _sw.ElapsedMilliseconds;
-				Debug.WriteLine (string.Format ("Finished in {0} ms ({1:0.0} s total)", _sw.ElapsedMilliseconds, _elapsedMilliseconds / 1000.0));
-			}
-			
-			return r;
-		}
-
-		public T ExecuteScalar<T> (string query, params object[] args)
-		{
-			var cmd = CreateCommand (query, args);
-			
-			if (TimeExecution) {
-				if (_sw == null) {
-					_sw = new Stopwatch ();
-				}
-				_sw.Reset ();
-				_sw.Start ();
-			}
-			
-			var r = cmd.ExecuteScalar<T> ();
-			
-			if (TimeExecution) {
-				_sw.Stop ();
-				_elapsedMilliseconds += _sw.ElapsedMilliseconds;
-				Debug.WriteLine (string.Format ("Finished in {0} ms ({1:0.0} s total)", _sw.ElapsedMilliseconds, _elapsedMilliseconds / 1000.0));
-			}
-			
-			return r;
-		}
-
-		/// <summary>
-		/// Creates a SQLiteCommand given the command text (SQL) with arguments. Place a '?'
-		/// in the command text for each of the arguments and then executes that command.
-		/// It returns each row of the result using the mapping automatically generated for
-		/// the given type.
-		/// </summary>
-		/// <param name="query">
-		/// The fully escaped SQL.
-		/// </param>
-		/// <param name="args">
-		/// Arguments to substitute for the occurences of '?' in the query.
-		/// </param>
-		/// <returns>
-		/// An enumerable with one result for each row returned by the query.
-		/// </returns>
-		public List<T> Query<T> (string query, params object[] args) where T : new()
-		{
-			var cmd = CreateCommand (query, args);
-			return cmd.ExecuteQuery<T> ();
-		}
-
-		/// <summary>
-		/// Creates a SQLiteCommand given the command text (SQL) with arguments. Place a '?'
-		/// in the command text for each of the arguments and then executes that command.
-		/// It returns each row of the result using the mapping automatically generated for
-		/// the given type.
-		/// </summary>
-		/// <param name="query">
-		/// The fully escaped SQL.
-		/// </param>
-		/// <param name="args">
-		/// Arguments to substitute for the occurences of '?' in the query.
-		/// </param>
-		/// <returns>
-		/// An enumerable with one result for each row returned by the query.
-		/// The enumerator will call sqlite3_step on each call to MoveNext, so the database
-		/// connection must remain open for the lifetime of the enumerator.
-		/// </returns>
-		public IEnumerable<T> DeferredQuery<T>(string query, params object[] args) where T : new()
-		{
-			var cmd = CreateCommand(query, args);
-			return cmd.ExecuteDeferredQuery<T>();
-		}
-
-		/// <summary>
-		/// Creates a SQLiteCommand given the command text (SQL) with arguments. Place a '?'
-		/// in the command text for each of the arguments and then executes that command.
-		/// It returns each row of the result using the specified mapping. This function is
-		/// only used by libraries in order to query the database via introspection. It is
-		/// normally not used.
-		/// </summary>
-		/// <param name="map">
-		/// A <see cref="TableMapping"/> to use to convert the resulting rows
-		/// into objects.
-		/// </param>
-		/// <param name="query">
-		/// The fully escaped SQL.
-		/// </param>
-		/// <param name="args">
-		/// Arguments to substitute for the occurences of '?' in the query.
-		/// </param>
-		/// <returns>
-		/// An enumerable with one result for each row returned by the query.
-		/// </returns>
-		public List<object> Query (TableMapping map, string query, params object[] args)
-		{
-			var cmd = CreateCommand (query, args);
-			return cmd.ExecuteQuery<object> (map);
-		}
-
-		/// <summary>
-		/// Creates a SQLiteCommand given the command text (SQL) with arguments. Place a '?'
-		/// in the command text for each of the arguments and then executes that command.
-		/// It returns each row of the result using the specified mapping. This function is
-		/// only used by libraries in order to query the database via introspection. It is
-		/// normally not used.
-		/// </summary>
-		/// <param name="map">
-		/// A <see cref="TableMapping"/> to use to convert the resulting rows
-		/// into objects.
-		/// </param>
-		/// <param name="query">
-		/// The fully escaped SQL.
-		/// </param>
-		/// <param name="args">
-		/// Arguments to substitute for the occurences of '?' in the query.
-		/// </param>
-		/// <returns>
-		/// An enumerable with one result for each row returned by the query.
-		/// The enumerator will call sqlite3_step on each call to MoveNext, so the database
-		/// connection must remain open for the lifetime of the enumerator.
-		/// </returns>
-		public IEnumerable<object> DeferredQuery(TableMapping map, string query, params object[] args)
-		{
-			var cmd = CreateCommand(query, args);
-			return cmd.ExecuteDeferredQuery<object>(map);
-		}
-
-		/// <summary>
-		/// Returns a queryable interface to the table represented by the given type.
-		/// </summary>
-		/// <returns>
-		/// A queryable object that is able to translate Where, OrderBy, and Take
-		/// queries into native SQL.
-		/// </returns>
-		public TableQuery<T> Table<T> () where T : new()
-		{
-			return new TableQuery<T> (this);
-		}
-
-		/// <summary>
-		/// Attempts to retrieve an object with the given primary key from the table
-		/// associated with the specified type. Use of this method requires that
-		/// the given type have a designated PrimaryKey (using the PrimaryKeyAttribute).
-		/// </summary>
-		/// <param name="pk">
-		/// The primary key.
-		/// </param>
-		/// <returns>
-		/// The object with the given primary key. Throws a not found exception
-		/// if the object is not found.
-		/// </returns>
-		public T Get<T> (object pk) where T : new()
-		{
-			var map = GetMapping (typeof(T));
-			return Query<T> (map.GetByPrimaryKeySql, pk).First ();
-		}
-
-        /// <summary>
-        /// Attempts to retrieve the first object that matches the predicate from the table
-        /// associated with the specified type. 
-        /// </summary>
-        /// <param name="predicate">
-        /// A predicate for which object to find.
-        /// </param>
-        /// <returns>
-        /// The object that matches the given predicate. Throws a not found exception
-        /// if the object is not found.
-        /// </returns>
-        public T Get<T> (Expression<Func<T, bool>> predicate) where T : new()
-        {
-            return Table<T> ().Where (predicate).First ();
-        }
-
-		/// <summary>
-		/// Attempts to retrieve an object with the given primary key from the table
-		/// associated with the specified type. Use of this method requires that
-		/// the given type have a designated PrimaryKey (using the PrimaryKeyAttribute).
-		/// </summary>
-		/// <param name="pk">
-		/// The primary key.
-		/// </param>
-		/// <returns>
-		/// The object with the given primary key or null
-		/// if the object is not found.
-		/// </returns>
-		public T Find<T> (object pk) where T : new ()
-		{
-			var map = GetMapping (typeof (T));
-			return Query<T> (map.GetByPrimaryKeySql, pk).FirstOrDefault ();
-		}
-
-		/// <summary>
-		/// Attempts to retrieve an object with the given primary key from the table
-		/// associated with the specified type. Use of this method requires that
-		/// the given type have a designated PrimaryKey (using the PrimaryKeyAttribute).
-		/// </summary>
-		/// <param name="pk">
-		/// The primary key.
-		/// </param>
-		/// <param name="map">
-		/// The TableMapping used to identify the object type.
-		/// </param>
-		/// <returns>
-		/// The object with the given primary key or null
-		/// if the object is not found.
-		/// </returns>
-		public object Find (object pk, TableMapping map)
-		{
-			return Query (map, map.GetByPrimaryKeySql, pk).FirstOrDefault ();
-		}
-		
-		/// <summary>
-        /// Attempts to retrieve the first object that matches the predicate from the table
-        /// associated with the specified type. 
-        /// </summary>
-        /// <param name="predicate">
-        /// A predicate for which object to find.
-        /// </param>
-        /// <returns>
-        /// The object that matches the given predicate or null
-        /// if the object is not found.
-        /// </returns>
-        public T Find<T> (Expression<Func<T, bool>> predicate) where T : new()
-        {
-            return Table<T> ().Where (predicate).FirstOrDefault ();
-        }
-
-		/// <summary>
-		/// Whether <see cref="BeginTransaction"/> has been called and the database is waiting for a <see cref="Commit"/>.
-		/// </summary>
-		public bool IsInTransaction {
-			get { return _transactionDepth > 0; }
-		}
-
-		/// <summary>
-		/// Begins a new transaction. Call <see cref="Commit"/> to end the transaction.
-		/// </summary>
-		/// <example cref="System.InvalidOperationException">Throws if a transaction has already begun.</example>
-		public void BeginTransaction ()
-		{
-			// The BEGIN command only works if the transaction stack is empty, 
-			//    or in other words if there are no pending transactions. 
-			// If the transaction stack is not empty when the BEGIN command is invoked, 
-			//    then the command fails with an error.
-			// Rather than crash with an error, we will just ignore calls to BeginTransaction
-			//    that would result in an error.
-			if (Interlocked.CompareExchange (ref _transactionDepth, 1, 0) == 0) {
-				try {
-					Execute ("begin transaction");
-				} catch (Exception ex) {
-					var sqlExp = ex as SQLiteException;
-					if (sqlExp != null) {
-						// It is recommended that applications respond to the errors listed below 
-						//    by explicitly issuing a ROLLBACK command.
-						// TODO: This rollback failsafe should be localized to all throw sites.
-						switch (sqlExp.Result) {
-						case SQLite3.Result.IOError:
-						case SQLite3.Result.Full:
-						case SQLite3.Result.Busy:
-						case SQLite3.Result.NoMem:
-						case SQLite3.Result.Interrupt:
-							RollbackTo (null, true);
-							break;
-						}
-					} else {
-						// Call decrement and not VolatileWrite in case we've already 
-						//    created a transaction point in SaveTransactionPoint since the catch.
-						Interlocked.Decrement (ref _transactionDepth);
-					}
-
-					throw;
-				}
-			} else { 
-				// Calling BeginTransaction on an already open transaction is invalid
-				throw new InvalidOperationException ("Cannot begin a transaction while already in a transaction.");
-			}
-		}
-
-		/// <summary>
-		/// Creates a savepoint in the database at the current point in the transaction timeline.
-		/// Begins a new transaction if one is not in progress.
-		/// 
-		/// Call <see cref="RollbackTo"/> to undo transactions since the returned savepoint.
-		/// Call <see cref="Release"/> to commit transactions after the savepoint returned here.
-		/// Call <see cref="Commit"/> to end the transaction, committing all changes.
-		/// </summary>
-		/// <returns>A string naming the savepoint.</returns>
-		public string SaveTransactionPoint ()
-		{
-			int depth = Interlocked.Increment (ref _transactionDepth) - 1;
-			string retVal = "S" + _rand.Next (short.MaxValue) + "D" + depth;
-
-			try {
-				Execute ("savepoint " + retVal);
-			} catch (Exception ex) {
-				var sqlExp = ex as SQLiteException;
-				if (sqlExp != null) {
-					// It is recommended that applications respond to the errors listed below 
-					//    by explicitly issuing a ROLLBACK command.
-					// TODO: This rollback failsafe should be localized to all throw sites.
-					switch (sqlExp.Result) {
-					case SQLite3.Result.IOError:
-					case SQLite3.Result.Full:
-					case SQLite3.Result.Busy:
-					case SQLite3.Result.NoMem:
-					case SQLite3.Result.Interrupt:
-						RollbackTo (null, true);
-						break;
-					}
-				} else {
-					Interlocked.Decrement (ref _transactionDepth);
-				}
-
-				throw;
-			}
-
-			return retVal;
-		}
-
-		/// <summary>
-		/// Rolls back the transaction that was begun by <see cref="BeginTransaction"/> or <see cref="SaveTransactionPoint"/>.
-		/// </summary>
-		public void Rollback ()
-		{
-			RollbackTo (null, false);
-		}
-
-		/// <summary>
-		/// Rolls back the savepoint created by <see cref="BeginTransaction"/> or SaveTransactionPoint.
-		/// </summary>
-		/// <param name="savepoint">The name of the savepoint to roll back to, as returned by <see cref="SaveTransactionPoint"/>.  If savepoint is null or empty, this method is equivalent to a call to <see cref="Rollback"/></param>
-		public void RollbackTo (string savepoint)
-		{
-			RollbackTo (savepoint, false);
-		}
-
-		/// <summary>
-		/// Rolls back the transaction that was begun by <see cref="BeginTransaction"/>.
-		/// </summary>
-		/// <param name="noThrow">true to avoid throwing exceptions, false otherwise</param>
-		void RollbackTo (string savepoint, bool noThrow)
-		{
-			// Rolling back without a TO clause rolls backs all transactions 
-			//    and leaves the transaction stack empty.   
-			try {
-				if (String.IsNullOrEmpty (savepoint)) {
-					if (Interlocked.Exchange (ref _transactionDepth, 0) > 0) {
-						Execute ("rollback");
-					}
-				} else {
-					DoSavePointExecute (savepoint, "rollback to ");
-				}   
-			} catch (SQLiteException) {
-				if (!noThrow)
-					throw;
-            
-			}
-			// No need to rollback if there are no transactions open.
-		}
-
-		/// <summary>
-		/// Releases a savepoint returned from <see cref="SaveTransactionPoint"/>.  Releasing a savepoint 
-		///    makes changes since that savepoint permanent if the savepoint began the transaction,
-		///    or otherwise the changes are permanent pending a call to <see cref="Commit"/>.
-		/// 
-		/// The RELEASE command is like a COMMIT for a SAVEPOINT.
-		/// </summary>
-		/// <param name="savepoint">The name of the savepoint to release.  The string should be the result of a call to <see cref="SaveTransactionPoint"/></param>
-		public void Release (string savepoint)
-		{
-			DoSavePointExecute (savepoint, "release ");
-		}
-
-		void DoSavePointExecute (string savepoint, string cmd)
-		{
-			// Validate the savepoint
-			int firstLen = savepoint.IndexOf ('D');
-			if (firstLen >= 2 && savepoint.Length > firstLen + 1) {
-				int depth;
-				if (Int32.TryParse (savepoint.Substring (firstLen + 1), out depth)) {
-					// TODO: Mild race here, but inescapable without locking almost everywhere.
-					if (0 <= depth && depth < _transactionDepth) {
-#if NETFX_CORE
-                        Volatile.Write (ref _transactionDepth, depth);
-#elif SILVERLIGHT
-						_transactionDepth = depth;
-#else
-                        Thread.VolatileWrite (ref _transactionDepth, depth);
-#endif
-                        Execute (cmd + savepoint);
-						return;
-					}
-				}
-			}
-
-			throw new ArgumentException ("savePoint is not valid, and should be the result of a call to SaveTransactionPoint.", "savePoint");
-		}
-
-		/// <summary>
-		/// Commits the transaction that was begun by <see cref="BeginTransaction"/>.
-		/// </summary>
-		public void Commit ()
-		{
-			if (Interlocked.Exchange (ref _transactionDepth, 0) != 0) {
-				Execute ("commit");
-			}
-			// Do nothing on a commit with no open transaction
-		}
-
-		/// <summary>
-		/// Executes <param name="action"> within a (possibly nested) transaction by wrapping it in a SAVEPOINT. If an
-		/// exception occurs the whole transaction is rolled back, not just the current savepoint. The exception
-		/// is rethrown.
-		/// </summary>
-		/// <param name="action">
-		/// The <see cref="Action"/> to perform within a transaction. <param name="action"> can contain any number
-		/// of operations on the connection but should never call <see cref="BeginTransaction"/> or
-		/// <see cref="Commit"/>.
-		/// </param>
-		public void RunInTransaction (Action action)
-		{
-			try {
-				var savePoint = SaveTransactionPoint ();
-				action ();
-				Release (savePoint);
-			} catch (Exception) {
-				Rollback ();
-				throw;
-			}
-		}
-
-		/// <summary>
-		/// Inserts all specified objects.
-		/// </summary>
-		/// <param name="objects">
-		/// An <see cref="IEnumerable"/> of the objects to insert.
-		/// </param>
-		/// <returns>
-		/// The number of rows added to the table.
-		/// </returns>
-		public int InsertAll (System.Collections.IEnumerable objects)
-		{
-			var c = 0;
-			RunInTransaction(() => {
-				foreach (var r in objects) {
-					c += Insert (r);
-				}
-			});
-			return c;
-		}
-
-		/// <summary>
-		/// Inserts all specified objects.
-		/// </summary>
-		/// <param name="objects">
-		/// An <see cref="IEnumerable"/> of the objects to insert.
-		/// </param>
-		/// <param name="extra">
-		/// Literal SQL code that gets placed into the command. INSERT {extra} INTO ...
-		/// </param>
-		/// <returns>
-		/// The number of rows added to the table.
-		/// </returns>
-		public int InsertAll (System.Collections.IEnumerable objects, string extra)
-		{
-			var c = 0;
-			RunInTransaction (() => {
-				foreach (var r in objects) {
-					c += Insert (r, extra);
-				}
-			});
-			return c;
-		}
-
-		/// <summary>
-		/// Inserts all specified objects.
-		/// </summary>
-		/// <param name="objects">
-		/// An <see cref="IEnumerable"/> of the objects to insert.
-		/// </param>
-		/// <param name="objType">
-		/// The type of object to insert.
-		/// </param>
-		/// <returns>
-		/// The number of rows added to the table.
-		/// </returns>
-		public int InsertAll (System.Collections.IEnumerable objects, Type objType)
-		{
-			var c = 0;
-			RunInTransaction (() => {
-				foreach (var r in objects) {
-					c += Insert (r, objType);
-				}
-			});
-			return c;
-		}
-		
-		/// <summary>
-		/// Inserts the given object and retrieves its
-		/// auto incremented primary key if it has one.
-		/// </summary>
-		/// <param name="obj">
-		/// The object to insert.
-		/// </param>
-		/// <returns>
-		/// The number of rows added to the table.
-		/// </returns>
-		public int Insert (object obj)
-		{
-			if (obj == null) {
-				return 0;
-			}
-			return Insert (obj, "", obj.GetType ());
-		}
-
-		/// <summary>
-		/// Inserts the given object and retrieves its
-		/// auto incremented primary key if it has one.
-		/// If a UNIQUE constraint violation occurs with
-		/// some pre-existing object, this function deletes
-		/// the old object.
-		/// </summary>
-		/// <param name="obj">
-		/// The object to insert.
-		/// </param>
-		/// <returns>
-		/// The number of rows modified.
-		/// </returns>
-		public int InsertOrReplace (object obj)
-		{
-			if (obj == null) {
-				return 0;
-			}
-			return Insert (obj, "OR REPLACE", obj.GetType ());
-		}
-
-		/// <summary>
-		/// Inserts the given object and retrieves its
-		/// auto incremented primary key if it has one.
-		/// </summary>
-		/// <param name="obj">
-		/// The object to insert.
-		/// </param>
-		/// <param name="objType">
-		/// The type of object to insert.
-		/// </param>
-		/// <returns>
-		/// The number of rows added to the table.
-		/// </returns>
-		public int Insert (object obj, Type objType)
-		{
-			return Insert (obj, "", objType);
-		}
-
-		/// <summary>
-		/// Inserts the given object and retrieves its
-		/// auto incremented primary key if it has one.
-		/// If a UNIQUE constraint violation occurs with
-		/// some pre-existing object, this function deletes
-		/// the old object.
-		/// </summary>
-		/// <param name="obj">
-		/// The object to insert.
-		/// </param>
-		/// <param name="objType">
-		/// The type of object to insert.
-		/// </param>
-		/// <returns>
-		/// The number of rows modified.
-		/// </returns>
-		public int InsertOrReplace (object obj, Type objType)
-		{
-			return Insert (obj, "OR REPLACE", objType);
-		}
-		
-		/// <summary>
-		/// Inserts the given object and retrieves its
-		/// auto incremented primary key if it has one.
-		/// </summary>
-		/// <param name="obj">
-		/// The object to insert.
-		/// </param>
-		/// <param name="extra">
-		/// Literal SQL code that gets placed into the command. INSERT {extra} INTO ...
-		/// </param>
-		/// <returns>
-		/// The number of rows added to the table.
-		/// </returns>
-		public int Insert (object obj, string extra)
-		{
-			if (obj == null) {
-				return 0;
-			}
-			return Insert (obj, extra, obj.GetType ());
-		}
-
-	    /// <summary>
-	    /// Inserts the given object and retrieves its
-	    /// auto incremented primary key if it has one.
-	    /// </summary>
-	    /// <param name="obj">
-	    /// The object to insert.
-	    /// </param>
-	    /// <param name="extra">
-	    /// Literal SQL code that gets placed into the command. INSERT {extra} INTO ...
-	    /// </param>
-	    /// <param name="objType">
-	    /// The type of object to insert.
-	    /// </param>
-	    /// <returns>
-	    /// The number of rows added to the table.
-	    /// </returns>
-	    public int Insert (object obj, string extra, Type objType)
-		{
-			if (obj == null || objType == null) {
-				return 0;
-			}
-			
-            
-			var map = GetMapping (objType);
-
-#if NETFX_CORE
-            if (map.PK != null && map.PK.IsAutoGuid)
-            {
-                // no GetProperty so search our way up the inheritance chain till we find it
-                PropertyInfo prop;
-                while (objType != null)
-                {
-                    var info = objType.GetTypeInfo();
-                    prop = info.GetDeclaredProperty(map.PK.PropertyName);
-                    if (prop != null) 
-                    {
-                        if (prop.GetValue(obj, null).Equals(Guid.Empty))
-                        {
-                            prop.SetValue(obj, Guid.NewGuid(), null);
-                        }
-                        break; 
-                    }
-
-                    objType = info.BaseType;
-                }
-            }
-#else
-            if (map.PK != null && map.PK.IsAutoGuid) {
-                var prop = objType.GetProperty(map.PK.PropertyName);
-                if (prop != null) {
-                    if (prop.GetValue(obj, null).Equals(Guid.Empty)) {
-                        prop.SetValue(obj, Guid.NewGuid(), null);
-                    }
-                }
-            }
-#endif
-
-
-			var replacing = string.Compare (extra, "OR REPLACE", StringComparison.OrdinalIgnoreCase) == 0;
-			
-			var cols = replacing ? map.InsertOrReplaceColumns : map.InsertColumns;
-			var vals = new object[cols.Length];
-			for (var i = 0; i < vals.Length; i++) {
-				vals [i] = cols [i].GetValue (obj);
-			}
-			
-			var insertCmd = map.GetInsertCommand (this, extra);
-			int count;
-
-			try {
-				count = insertCmd.ExecuteNonQuery (vals);
-			}
-			catch (SQLiteException ex) {
-
-				if (SQLite3.ExtendedErrCode (this.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
-					throw NotNullConstraintViolationException.New (ex.Result, ex.Message, map, obj);
-				}
-				throw;
-			}
-
-            if (map.HasAutoIncPK)
-            {
-				var id = SQLite3.LastInsertRowid (Handle);
-				map.SetAutoIncPK (obj, id);
-			}
-			
-			return count;
-		}
-
-		/// <summary>
-		/// Updates all of the columns of a table using the specified object
-		/// except for its primary key.
-		/// The object is required to have a primary key.
-		/// </summary>
-		/// <param name="obj">
-		/// The object to update. It must have a primary key designated using the PrimaryKeyAttribute.
-		/// </param>
-		/// <returns>
-		/// The number of rows updated.
-		/// </returns>
-		public int Update (object obj)
-		{
-			if (obj == null) {
-				return 0;
-			}
-			return Update (obj, obj.GetType ());
-		}
-
-		/// <summary>
-		/// Updates all of the columns of a table using the specified object
-		/// except for its primary key.
-		/// The object is required to have a primary key.
-		/// </summary>
-		/// <param name="obj">
-		/// The object to update. It must have a primary key designated using the PrimaryKeyAttribute.
-		/// </param>
-		/// <param name="objType">
-		/// The type of object to insert.
-		/// </param>
-		/// <returns>
-		/// The number of rows updated.
-		/// </returns>
-		public int Update (object obj, Type objType)
-		{
-			int rowsAffected = 0;
-			if (obj == null || objType == null) {
-				return 0;
-			}
-			
-			var map = GetMapping (objType);
-			
-			var pk = map.PK;
-			
-			if (pk == null) {
-				throw new NotSupportedException ("Cannot update " + map.TableName + ": it has no PK");
-			}
-			
-			var cols = from p in map.Columns
-				where p != pk
-				select p;
-			var vals = from c in cols
-				select c.GetValue (obj);
-			var ps = new List<object> (vals);
-			ps.Add (pk.GetValue (obj));
-			var q = string.Format ("update \"{0}\" set {1} where {2} = ? ", map.TableName, string.Join (",", (from c in cols
-				select "\"" + c.Name + "\" = ? ").ToArray ()), pk.Name);
-
-			try {
-				rowsAffected = Execute (q, ps.ToArray ());
-			}
-			catch (SQLiteException ex) {
-
-				if (ex.Result == SQLite3.Result.Constraint && SQLite3.ExtendedErrCode (this.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
-					throw NotNullConstraintViolationException.New (ex, map, obj);
-				}
-
-				throw ex;
-			}
-
-			return rowsAffected;
-		}
-
-		/// <summary>
-		/// Updates all specified objects.
-		/// </summary>
-		/// <param name="objects">
-		/// An <see cref="IEnumerable"/> of the objects to insert.
-		/// </param>
-		/// <returns>
-		/// The number of rows modified.
-		/// </returns>
-		public int UpdateAll (System.Collections.IEnumerable objects)
-		{
-			var c = 0;
-			RunInTransaction (() => {
-				foreach (var r in objects) {
-					c += Update (r);
-				}
-			});
-			return c;
-		}
-
-		/// <summary>
-		/// Deletes the given object from the database using its primary key.
-		/// </summary>
-		/// <param name="objectToDelete">
-		/// The object to delete. It must have a primary key designated using the PrimaryKeyAttribute.
-		/// </param>
-		/// <returns>
-		/// The number of rows deleted.
-		/// </returns>
-		public int Delete (object objectToDelete)
-		{
-			var map = GetMapping (objectToDelete.GetType ());
-			var pk = map.PK;
-			if (pk == null) {
-				throw new NotSupportedException ("Cannot delete " + map.TableName + ": it has no PK");
-			}
-			var q = string.Format ("delete from \"{0}\" where \"{1}\" = ?", map.TableName, pk.Name);
-			return Execute (q, pk.GetValue (objectToDelete));
-		}
-
-		/// <summary>
-		/// Deletes the object with the specified primary key.
-		/// </summary>
-		/// <param name="primaryKey">
-		/// The primary key of the object to delete.
-		/// </param>
-		/// <returns>
-		/// The number of objects deleted.
-		/// </returns>
-		/// <typeparam name='T'>
-		/// The type of object.
-		/// </typeparam>
-		public int Delete<T> (object primaryKey)
-		{
-			var map = GetMapping (typeof (T));
-			var pk = map.PK;
-			if (pk == null) {
-				throw new NotSupportedException ("Cannot delete " + map.TableName + ": it has no PK");
-			}
-			var q = string.Format ("delete from \"{0}\" where \"{1}\" = ?", map.TableName, pk.Name);
-			return Execute (q, primaryKey);
-		}
-
-		/// <summary>
-		/// Deletes all the objects from the specified table.
-		/// WARNING WARNING: Let me repeat. It deletes ALL the objects from the
-		/// specified table. Do you really want to do that?
-		/// </summary>
-		/// <returns>
-		/// The number of objects deleted.
-		/// </returns>
-		/// <typeparam name='T'>
-		/// The type of objects to delete.
-		/// </typeparam>
-		public int DeleteAll<T> ()
-		{
-			var map = GetMapping (typeof (T));
-			var query = string.Format("delete from \"{0}\"", map.TableName);
-			return Execute (query);
-		}
-
-		~SQLiteConnection ()
-		{
-			Dispose (false);
-		}
-
-		public void Dispose ()
-		{
-			Dispose (true);
-			GC.SuppressFinalize (this);
-		}
-
-		protected virtual void Dispose (bool disposing)
-		{
-			Close ();
-		}
-
-		public void Close ()
-		{
-			if (_open && Handle != NullHandle) {
-				try {
-					if (_mappings != null) {
-						foreach (var sqlInsertCommand in _mappings.Values) {
-							sqlInsertCommand.Dispose();
-						}
-					}
-					var r = SQLite3.Close (Handle);
-					if (r != SQLite3.Result.OK) {
-						string msg = SQLite3.GetErrmsg (Handle);
-						throw SQLiteException.New (r, msg);
-					}
-				}
-				finally {
-					Handle = NullHandle;
-					_open = false;
-				}
-			}
-		}
-	}
-
-	/// <summary>
-	/// Represents a parsed connection string.
-	/// </summary>
-	class SQLiteConnectionString
-	{
-		public string ConnectionString { get; private set; }
-		public string DatabasePath { get; private set; }
-		public bool StoreDateTimeAsTicks { get; private set; }
-
-#if NETFX_CORE
-		static readonly string MetroStyleDataPath = Windows.Storage.ApplicationData.Current.LocalFolder.Path;
-#endif
-
-		public SQLiteConnectionString (string databasePath, bool storeDateTimeAsTicks)
-		{
-			ConnectionString = databasePath;
-			StoreDateTimeAsTicks = storeDateTimeAsTicks;
-
-#if NETFX_CORE
-			DatabasePath = System.IO.Path.Combine (MetroStyleDataPath, databasePath);
-#else
-			DatabasePath = databasePath;
-#endif
-		}
-	}
-
-    [AttributeUsage (AttributeTargets.Class)]
-	public class TableAttribute : Attribute
-	{
-		public string Name { get; set; }
-
-		public TableAttribute (string name)
-		{
-			Name = name;
-		}
-	}
-
-	[AttributeUsage (AttributeTargets.Property)]
-	public class ColumnAttribute : Attribute
-	{
-		public string Name { get; set; }
-
-		public ColumnAttribute (string name)
-		{
-			Name = name;
-		}
-	}
-
-	[AttributeUsage (AttributeTargets.Property)]
-	public class PrimaryKeyAttribute : Attribute
-	{
-	}
-
-	[AttributeUsage (AttributeTargets.Property)]
-	public class AutoIncrementAttribute : Attribute
-	{
-	}
-
-	[AttributeUsage (AttributeTargets.Property)]
-	public class IndexedAttribute : Attribute
-	{
-		public string Name { get; set; }
-		public int Order { get; set; }
-		public virtual bool Unique { get; set; }
-		
-		public IndexedAttribute()
-		{
-		}
-		
-		public IndexedAttribute(string name, int order)
-		{
-			Name = name;
-			Order = order;
-		}
-	}
-
-	[AttributeUsage (AttributeTargets.Property)]
-	public class IgnoreAttribute : Attribute
-	{
-	}
-
-	[AttributeUsage (AttributeTargets.Property)]
-	public class UniqueAttribute : IndexedAttribute
-	{
-		public override bool Unique {
-			get { return true; }
-			set { /* throw?  */ }
-		}
-	}
-
-	[AttributeUsage (AttributeTargets.Property)]
-	public class MaxLengthAttribute : Attribute
-	{
-		public int Value { get; private set; }
-
-		public MaxLengthAttribute (int length)
-		{
-			Value = length;
-		}
-	}
-
-	[AttributeUsage (AttributeTargets.Property)]
-	public class CollationAttribute: Attribute
-	{
-		public string Value { get; private set; }
-
-		public CollationAttribute (string collation)
-		{
-			Value = collation;
-		}
-	}
-
-	[AttributeUsage (AttributeTargets.Property)]
-	public class NotNullAttribute : Attribute
-	{
-	}
-
-	public class TableMapping
-	{
-		public Type MappedType { get; private set; }
-
-		public string TableName { get; private set; }
-
-		public Column[] Columns { get; private set; }
-
-		public Column PK { get; private set; }
-
-		public string GetByPrimaryKeySql { get; private set; }
-
-		Column _autoPk;
-		Column[] _insertColumns;
-		Column[] _insertOrReplaceColumns;
-
-        public TableMapping(Type type, CreateFlags createFlags = CreateFlags.None)
-		{
-			MappedType = type;
-
-#if NETFX_CORE
-			var tableAttr = (TableAttribute)System.Reflection.CustomAttributeExtensions
-                .GetCustomAttribute(type.GetTypeInfo(), typeof(TableAttribute), true);
-#else
-			var tableAttr = (TableAttribute)type.GetCustomAttributes (typeof (TableAttribute), true).FirstOrDefault ();
-#endif
-
-			TableName = tableAttr != null ? tableAttr.Name : MappedType.Name;
-
-#if !NETFX_CORE
-			var props = MappedType.GetProperties (BindingFlags.Public | BindingFlags.Instance | BindingFlags.SetProperty);
-#else
-			var props = from p in MappedType.GetRuntimeProperties()
-						where ((p.GetMethod != null && p.GetMethod.IsPublic) || (p.SetMethod != null && p.SetMethod.IsPublic) || (p.GetMethod != null && p.GetMethod.IsStatic) || (p.SetMethod != null && p.SetMethod.IsStatic))
-						select p;
-#endif
-			var cols = new List<Column> ();
-			foreach (var p in props) {
-#if !NETFX_CORE
-				var ignore = p.GetCustomAttributes (typeof(IgnoreAttribute), true).Length > 0;
-#else
-				var ignore = p.GetCustomAttributes (typeof(IgnoreAttribute), true).Count() > 0;
-#endif
-				if (p.CanWrite && !ignore) {
-					cols.Add (new Column (p, createFlags));
-				}
-			}
-			Columns = cols.ToArray ();
-			foreach (var c in Columns) {
-				if (c.IsAutoInc && c.IsPK) {
-					_autoPk = c;
-				}
-				if (c.IsPK) {
-					PK = c;
-				}
-			}
-			
-			HasAutoIncPK = _autoPk != null;
-
-			if (PK != null) {
-				GetByPrimaryKeySql = string.Format ("select * from \"{0}\" where \"{1}\" = ?", TableName, PK.Name);
-			}
-			else {
-				// People should not be calling Get/Find without a PK
-				GetByPrimaryKeySql = string.Format ("select * from \"{0}\" limit 1", TableName);
-			}
-		}
-
-		public bool HasAutoIncPK { get; private set; }
-
-		public void SetAutoIncPK (object obj, long id)
-		{
-			if (_autoPk != null) {
-				_autoPk.SetValue (obj, Convert.ChangeType (id, _autoPk.ColumnType, null));
-			}
-		}
-
-		public Column[] InsertColumns {
-			get {
-				if (_insertColumns == null) {
-					_insertColumns = Columns.Where (c => !c.IsAutoInc).ToArray ();
-				}
-				return _insertColumns;
-			}
-		}
-
-		public Column[] InsertOrReplaceColumns {
-			get {
-				if (_insertOrReplaceColumns == null) {
-					_insertOrReplaceColumns = Columns.ToArray ();
-				}
-				return _insertOrReplaceColumns;
-			}
-		}
-
-		public Column FindColumnWithPropertyName (string propertyName)
-		{
-			var exact = Columns.FirstOrDefault (c => c.PropertyName == propertyName);
-			return exact;
-		}
-
-		public Column FindColumn (string columnName)
-		{
-			var exact = Columns.FirstOrDefault (c => c.Name == columnName);
-			return exact;
-		}
-		
-		PreparedSqlLiteInsertCommand _insertCommand;
-		string _insertCommandExtra;
-
-		public PreparedSqlLiteInsertCommand GetInsertCommand(SQLiteConnection conn, string extra)
-		{
-			if (_insertCommand == null) {
-				_insertCommand = CreateInsertCommand(conn, extra);
-				_insertCommandExtra = extra;
-			}
-			else if (_insertCommandExtra != extra) {
-				_insertCommand.Dispose();
-				_insertCommand = CreateInsertCommand(conn, extra);
-				_insertCommandExtra = extra;
-			}
-			return _insertCommand;
-		}
-		
-		PreparedSqlLiteInsertCommand CreateInsertCommand(SQLiteConnection conn, string extra)
-		{
-			var cols = InsertColumns;
-		    string insertSql;
-            if (!cols.Any() && Columns.Count() == 1 && Columns[0].IsAutoInc)
-            {
-                insertSql = string.Format("insert {1} into \"{0}\" default values", TableName, extra);
-            }
-            else
-            {
-				var replacing = string.Compare (extra, "OR REPLACE", StringComparison.OrdinalIgnoreCase) == 0;
-
-				if (replacing) {
-					cols = InsertOrReplaceColumns;
-				}
-
-                insertSql = string.Format("insert {3} into \"{0}\"({1}) values ({2})", TableName,
-                                   string.Join(",", (from c in cols
-                                                     select "\"" + c.Name + "\"").ToArray()),
-                                   string.Join(",", (from c in cols
-                                                     select "?").ToArray()), extra);
-                
-            }
-			
-			var insertCommand = new PreparedSqlLiteInsertCommand(conn);
-			insertCommand.CommandText = insertSql;
-			return insertCommand;
-		}
-		
-		protected internal void Dispose()
-		{
-			if (_insertCommand != null) {
-				_insertCommand.Dispose();
-				_insertCommand = null;
-			}
-		}
-
-		public class Column
-		{
-			PropertyInfo _prop;
-
-			public string Name { get; private set; }
-
-			public string PropertyName { get { return _prop.Name; } }
-
-			public Type ColumnType { get; private set; }
-
-			public string Collation { get; private set; }
-
-            public bool IsAutoInc { get; private set; }
-            public bool IsAutoGuid { get; private set; }
-
-			public bool IsPK { get; private set; }
-
-			public IEnumerable<IndexedAttribute> Indices { get; set; }
-
-			public bool IsNullable { get; private set; }
-
-			public int? MaxStringLength { get; private set; }
-
-            public Column(PropertyInfo prop, CreateFlags createFlags = CreateFlags.None)
-            {
-                var colAttr = (ColumnAttribute)prop.GetCustomAttributes(typeof(ColumnAttribute), true).FirstOrDefault();
-
-                _prop = prop;
-                Name = colAttr == null ? prop.Name : colAttr.Name;
-                //If this type is Nullable<T> then Nullable.GetUnderlyingType returns the T, otherwise it returns null, so get the actual type instead
-                ColumnType = Nullable.GetUnderlyingType(prop.PropertyType) ?? prop.PropertyType;
-                Collation = Orm.Collation(prop);
-
-                IsPK = Orm.IsPK(prop) ||
-					(((createFlags & CreateFlags.ImplicitPK) == CreateFlags.ImplicitPK) &&
-					 	string.Compare (prop.Name, Orm.ImplicitPkName, StringComparison.OrdinalIgnoreCase) == 0);
-
-                var isAuto = Orm.IsAutoInc(prop) || (IsPK && ((createFlags & CreateFlags.AutoIncPK) == CreateFlags.AutoIncPK));
-                IsAutoGuid = isAuto && ColumnType == typeof(Guid);
-                IsAutoInc = isAuto && !IsAutoGuid;
-
-                Indices = Orm.GetIndices(prop);
-                if (!Indices.Any()
-                    && !IsPK
-                    && ((createFlags & CreateFlags.ImplicitIndex) == CreateFlags.ImplicitIndex)
-                    && Name.EndsWith (Orm.ImplicitIndexSuffix, StringComparison.OrdinalIgnoreCase)
-                    )
-                {
-                    Indices = new IndexedAttribute[] { new IndexedAttribute() };
-                }
-                IsNullable = !(IsPK || Orm.IsMarkedNotNull(prop));
-                MaxStringLength = Orm.MaxStringLength(prop);
-            }
-
-			public void SetValue (object obj, object val)
-			{
-				_prop.SetValue (obj, val, null);
-			}
-
-			public object GetValue (object obj)
-			{
-				return _prop.GetValue (obj, null);
-			}
-		}
-	}
-
-	public static class Orm
-	{
-        public const int DefaultMaxStringLength = 140;
-        public const string ImplicitPkName = "Id";
-        public const string ImplicitIndexSuffix = "Id";
-
-		public static string SqlDecl (TableMapping.Column p, bool storeDateTimeAsTicks)
-		{
-			string decl = "\"" + p.Name + "\" " + SqlType (p, storeDateTimeAsTicks) + " ";
-			
-			if (p.IsPK) {
-				decl += "primary key ";
-			}
-			if (p.IsAutoInc) {
-				decl += "autoincrement ";
-			}
-			if (!p.IsNullable) {
-				decl += "not null ";
-			}
-			if (!string.IsNullOrEmpty (p.Collation)) {
-				decl += "collate " + p.Collation + " ";
-			}
-			
-			return decl;
-		}
-
-		public static string SqlType (TableMapping.Column p, bool storeDateTimeAsTicks)
-		{
-			var clrType = p.ColumnType;
-			if (clrType == typeof(Boolean) || clrType == typeof(Byte) || clrType == typeof(UInt16) || clrType == typeof(SByte) || clrType == typeof(Int16) || clrType == typeof(Int32)) {
-				return "integer";
-			} else if (clrType == typeof(UInt32) || clrType == typeof(Int64)) {
-				return "bigint";
-			} else if (clrType == typeof(Single) || clrType == typeof(Double) || clrType == typeof(Decimal)) {
-				return "float";
-			} else if (clrType == typeof(String)) {
-				int? len = p.MaxStringLength;
-
-				if (len.HasValue)
-					return "varchar(" + len.Value + ")";
-
-				return "varchar";
-			} else if (clrType == typeof(TimeSpan)) {
-                return "bigint";
-			} else if (clrType == typeof(DateTime)) {
-				return storeDateTimeAsTicks ? "bigint" : "datetime";
-			} else if (clrType == typeof(DateTimeOffset)) {
-				return "bigint";
-#if !NETFX_CORE
-			} else if (clrType.IsEnum) {
-#else
-			} else if (clrType.GetTypeInfo().IsEnum) {
-#endif
-				return "integer";
-			} else if (clrType == typeof(byte[])) {
-				return "blob";
-            } else if (clrType == typeof(Guid)) {
-                return "varchar(36)";
-            } else {
-				throw new NotSupportedException ("Don't know about " + clrType);
-			}
-		}
-
-		public static bool IsPK (MemberInfo p)
-		{
-			var attrs = p.GetCustomAttributes (typeof(PrimaryKeyAttribute), true);
-#if !NETFX_CORE
-			return attrs.Length > 0;
-#else
-			return attrs.Count() > 0;
-#endif
-		}
-
-		public static string Collation (MemberInfo p)
-		{
-			var attrs = p.GetCustomAttributes (typeof(CollationAttribute), true);
-#if !NETFX_CORE
-			if (attrs.Length > 0) {
-				return ((CollationAttribute)attrs [0]).Value;
-#else
-			if (attrs.Count() > 0) {
-                return ((CollationAttribute)attrs.First()).Value;
-#endif
-			} else {
-				return string.Empty;
-			}
-		}
-
-		public static bool IsAutoInc (MemberInfo p)
-		{
-			var attrs = p.GetCustomAttributes (typeof(AutoIncrementAttribute), true);
-#if !NETFX_CORE
-			return attrs.Length > 0;
-#else
-			return attrs.Count() > 0;
-#endif
-		}
-
-		public static IEnumerable<IndexedAttribute> GetIndices(MemberInfo p)
-		{
-			var attrs = p.GetCustomAttributes(typeof(IndexedAttribute), true);
-			return attrs.Cast<IndexedAttribute>();
-		}
-		
-		public static int? MaxStringLength(PropertyInfo p)
-		{
-			var attrs = p.GetCustomAttributes (typeof(MaxLengthAttribute), true);
-#if !NETFX_CORE
-			if (attrs.Length > 0)
-				return ((MaxLengthAttribute)attrs [0]).Value;
-#else
-			if (attrs.Count() > 0)
-				return ((MaxLengthAttribute)attrs.First()).Value;
-#endif
-
-			return null;
-		}
-
-		public static bool IsMarkedNotNull(MemberInfo p)
-		{
-			var attrs = p.GetCustomAttributes (typeof (NotNullAttribute), true);
-#if !NETFX_CORE
-			return attrs.Length > 0;
-#else
-	return attrs.Count() > 0;
-#endif
-		}
-	}
-
-	public partial class SQLiteCommand
-	{
-		SQLiteConnection _conn;
-		private List<Binding> _bindings;
-
-		public string CommandText { get; set; }
-
-		internal SQLiteCommand (SQLiteConnection conn)
-		{
-			_conn = conn;
-			_bindings = new List<Binding> ();
-			CommandText = "";
-		}
-
-		public int ExecuteNonQuery ()
-		{
-			if (_conn.Trace) {
-				Debug.WriteLine ("Executing: " + this);
-			}
-			
-			var r = SQLite3.Result.OK;
-			var stmt = Prepare ();
-			r = SQLite3.Step (stmt);
-			Finalize (stmt);
-			if (r == SQLite3.Result.Done) {
-				int rowsAffected = SQLite3.Changes (_conn.Handle);
-				return rowsAffected;
-			} else if (r == SQLite3.Result.Error) {
-				string msg = SQLite3.GetErrmsg (_conn.Handle);
-				throw SQLiteException.New (r, msg);
-			}
-			else if (r == SQLite3.Result.Constraint) {
-				if (SQLite3.ExtendedErrCode (_conn.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
-					throw NotNullConstraintViolationException.New (r, SQLite3.GetErrmsg (_conn.Handle));
-				}
-			}
-
-			throw SQLiteException.New(r, r.ToString());
-		}
-
-		public IEnumerable<T> ExecuteDeferredQuery<T> ()
-		{
-			return ExecuteDeferredQuery<T>(_conn.GetMapping(typeof(T)));
-		}
-
-		public List<T> ExecuteQuery<T> ()
-		{
-			return ExecuteDeferredQuery<T>(_conn.GetMapping(typeof(T))).ToList();
-		}
-
-		public List<T> ExecuteQuery<T> (TableMapping map)
-		{
-			return ExecuteDeferredQuery<T>(map).ToList();
-		}
-
-		/// <summary>
-		/// Invoked every time an instance is loaded from the database.
-		/// </summary>
-		/// <param name='obj'>
-		/// The newly created object.
-		/// </param>
-		/// <remarks>
-		/// This can be overridden in combination with the <see cref="SQLiteConnection.NewCommand"/>
-		/// method to hook into the life-cycle of objects.
-		///
-		/// Type safety is not possible because MonoTouch does not support virtual generic methods.
-		/// </remarks>
-		protected virtual void OnInstanceCreated (object obj)
-		{
-			// Can be overridden.
-		}
-
-		public IEnumerable<T> ExecuteDeferredQuery<T> (TableMapping map)
-		{
-			if (_conn.Trace) {
-				Debug.WriteLine ("Executing Query: " + this);
-			}
-
-			var stmt = Prepare ();
-			try
-			{
-				var cols = new TableMapping.Column[SQLite3.ColumnCount (stmt)];
-
-				for (int i = 0; i < cols.Length; i++) {
-					var name = SQLite3.ColumnName16 (stmt, i);
-					cols [i] = map.FindColumn (name);
-				}
-			
-				while (SQLite3.Step (stmt) == SQLite3.Result.Row) {
-					var obj = Activator.CreateInstance(map.MappedType);
-					for (int i = 0; i < cols.Length; i++) {
-						if (cols [i] == null)
-							continue;
-						var colType = SQLite3.ColumnType (stmt, i);
-						var val = ReadCol (stmt, i, colType, cols [i].ColumnType);
-						cols [i].SetValue (obj, val);
- 					}
-					OnInstanceCreated (obj);
-					yield return (T)obj;
-				}
-			}
-			finally
-			{
-				SQLite3.Finalize(stmt);
-			}
-		}
-
-		public T ExecuteScalar<T> ()
-		{
-			if (_conn.Trace) {
-				Debug.WriteLine ("Executing Query: " + this);
-			}
-			
-			T val = default(T);
-			
-			var stmt = Prepare ();
-
-            try
-            {
-                var r = SQLite3.Step (stmt);
-                if (r == SQLite3.Result.Row) {
-                    var colType = SQLite3.ColumnType (stmt, 0);
-                    val = (T)ReadCol (stmt, 0, colType, typeof(T));
-                }
-                else if (r == SQLite3.Result.Done) {
-                }
-                else
-                {
-                    throw SQLiteException.New (r, SQLite3.GetErrmsg (_conn.Handle));
-                }
-            }
-            finally
-            {
-                Finalize (stmt);
-            }
-			
-			return val;
-		}
-
-		public void Bind (string name, object val)
-		{
-			_bindings.Add (new Binding {
-				Name = name,
-				Value = val
-			});
-		}
-
-		public void Bind (object val)
-		{
-			Bind (null, val);
-		}
-
-		public override string ToString ()
-		{
-			var parts = new string[1 + _bindings.Count];
-			parts [0] = CommandText;
-			var i = 1;
-			foreach (var b in _bindings) {
-				parts [i] = string.Format ("  {0}: {1}", i - 1, b.Value);
-				i++;
-			}
-			return string.Join (Environment.NewLine, parts);
-		}
-
-		Sqlite3Statement Prepare()
-		{
-			var stmt = SQLite3.Prepare2 (_conn.Handle, CommandText);
-			BindAll (stmt);
-			return stmt;
-		}
-
-		void Finalize (Sqlite3Statement stmt)
-		{
-			SQLite3.Finalize (stmt);
-		}
-
-		void BindAll (Sqlite3Statement stmt)
-		{
-			int nextIdx = 1;
-			foreach (var b in _bindings) {
-				if (b.Name != null) {
-					b.Index = SQLite3.BindParameterIndex (stmt, b.Name);
-				} else {
-					b.Index = nextIdx++;
-				}
-				
-				BindParameter (stmt, b.Index, b.Value, _conn.StoreDateTimeAsTicks);
-			}
-		}
-
-		internal static IntPtr NegativePointer = new IntPtr (-1);
-
-		internal static void BindParameter (Sqlite3Statement stmt, int index, object value, bool storeDateTimeAsTicks)
-		{
-			if (value == null) {
-				SQLite3.BindNull (stmt, index);
-			} else {
-				if (value is Int32) {
-					SQLite3.BindInt (stmt, index, (int)value);
-				} else if (value is String) {
-					SQLite3.BindText (stmt, index, (string)value, -1, NegativePointer);
-				} else if (value is Byte || value is UInt16 || value is SByte || value is Int16) {
-					SQLite3.BindInt (stmt, index, Convert.ToInt32 (value));
-				} else if (value is Boolean) {
-					SQLite3.BindInt (stmt, index, (bool)value ? 1 : 0);
-				} else if (value is UInt32 || value is Int64) {
-					SQLite3.BindInt64 (stmt, index, Convert.ToInt64 (value));
-				} else if (value is Single || value is Double || value is Decimal) {
-					SQLite3.BindDouble (stmt, index, Convert.ToDouble (value));
-				} else if (value is TimeSpan) {
-					SQLite3.BindInt64(stmt, index, ((TimeSpan)value).Ticks);
-				} else if (value is DateTime) {
-					if (storeDateTimeAsTicks) {
-						SQLite3.BindInt64 (stmt, index, ((DateTime)value).Ticks);
-					}
-					else {
-						SQLite3.BindText (stmt, index, ((DateTime)value).ToString ("yyyy-MM-dd HH:mm:ss"), -1, NegativePointer);
-					}
-				} else if (value is DateTimeOffset) {
-					SQLite3.BindInt64 (stmt, index, ((DateTimeOffset)value).UtcTicks);
-#if !NETFX_CORE
-				} else if (value.GetType().IsEnum) {
-#else
-				} else if (value.GetType().GetTypeInfo().IsEnum) {
-#endif
-					SQLite3.BindInt (stmt, index, Convert.ToInt32 (value));
-                } else if (value is byte[]){
-                    SQLite3.BindBlob(stmt, index, (byte[]) value, ((byte[]) value).Length, NegativePointer);
-                } else if (value is Guid) {
-                    SQLite3.BindText(stmt, index, ((Guid)value).ToString(), 72, NegativePointer);
-                } else {
-                    throw new NotSupportedException("Cannot store type: " + value.GetType());
-                }
-			}
-		}
-
-		class Binding
-		{
-			public string Name { get; set; }
-
-			public object Value { get; set; }
-
-			public int Index { get; set; }
-		}
-
-		object ReadCol (Sqlite3Statement stmt, int index, SQLite3.ColType type, Type clrType)
-		{
-			if (type == SQLite3.ColType.Null) {
-				return null;
-			} else {
-				if (clrType == typeof(String)) {
-					return SQLite3.ColumnString (stmt, index);
-				} else if (clrType == typeof(Int32)) {
-					return (int)SQLite3.ColumnInt (stmt, index);
-				} else if (clrType == typeof(Boolean)) {
-					return SQLite3.ColumnInt (stmt, index) == 1;
-				} else if (clrType == typeof(double)) {
-					return SQLite3.ColumnDouble (stmt, index);
-				} else if (clrType == typeof(float)) {
-					return (float)SQLite3.ColumnDouble (stmt, index);
-				} else if (clrType == typeof(TimeSpan)) {
-					return new TimeSpan(SQLite3.ColumnInt64(stmt, index));
-				} else if (clrType == typeof(DateTime)) {
-					if (_conn.StoreDateTimeAsTicks) {
-						return new DateTime (SQLite3.ColumnInt64 (stmt, index));
-					}
-					else {
-						var text = SQLite3.ColumnString (stmt, index);
-						return DateTime.Parse (text);
-					}
-				} else if (clrType == typeof(DateTimeOffset)) {
-					return new DateTimeOffset(SQLite3.ColumnInt64 (stmt, index),TimeSpan.Zero);
-#if !NETFX_CORE
-				} else if (clrType.IsEnum) {
-#else
-				} else if (clrType.GetTypeInfo().IsEnum) {
-#endif
-					return SQLite3.ColumnInt (stmt, index);
-				} else if (clrType == typeof(Int64)) {
-					return SQLite3.ColumnInt64 (stmt, index);
-				} else if (clrType == typeof(UInt32)) {
-					return (uint)SQLite3.ColumnInt64 (stmt, index);
-				} else if (clrType == typeof(decimal)) {
-					return (decimal)SQLite3.ColumnDouble (stmt, index);
-				} else if (clrType == typeof(Byte)) {
-					return (byte)SQLite3.ColumnInt (stmt, index);
-				} else if (clrType == typeof(UInt16)) {
-					return (ushort)SQLite3.ColumnInt (stmt, index);
-				} else if (clrType == typeof(Int16)) {
-					return (short)SQLite3.ColumnInt (stmt, index);
-				} else if (clrType == typeof(sbyte)) {
-					return (sbyte)SQLite3.ColumnInt (stmt, index);
-				} else if (clrType == typeof(byte[])) {
-					return SQLite3.ColumnByteArray (stmt, index);
-				} else if (clrType == typeof(Guid)) {
-                  var text = SQLite3.ColumnString(stmt, index);
-                  return new Guid(text);
-                } else{
-					throw new NotSupportedException ("Don't know how to read " + clrType);
-				}
-			}
-		}
-	}
-
-	/// <summary>
-	/// Since the insert never changed, we only need to prepare once.
-	/// </summary>
-	public class PreparedSqlLiteInsertCommand : IDisposable
-	{
-		public bool Initialized { get; set; }
-
-		protected SQLiteConnection Connection { get; set; }
-
-		public string CommandText { get; set; }
-
-		protected Sqlite3Statement Statement { get; set; }
-		internal static readonly Sqlite3Statement NullStatement = default(Sqlite3Statement);
-
-		internal PreparedSqlLiteInsertCommand (SQLiteConnection conn)
-		{
-			Connection = conn;
-		}
-
-		public int ExecuteNonQuery (object[] source)
-		{
-			if (Connection.Trace) {
-				Debug.WriteLine ("Executing: " + CommandText);
-			}
-
-			var r = SQLite3.Result.OK;
-
-			if (!Initialized) {
-				Statement = Prepare ();
-				Initialized = true;
-			}
-
-			//bind the values.
-			if (source != null) {
-				for (int i = 0; i < source.Length; i++) {
-					SQLiteCommand.BindParameter (Statement, i + 1, source [i], Connection.StoreDateTimeAsTicks);
-				}
-			}
-			r = SQLite3.Step (Statement);
-
-			if (r == SQLite3.Result.Done) {
-				int rowsAffected = SQLite3.Changes (Connection.Handle);
-				SQLite3.Reset (Statement);
-				return rowsAffected;
-			} else if (r == SQLite3.Result.Error) {
-				string msg = SQLite3.GetErrmsg (Connection.Handle);
-				SQLite3.Reset (Statement);
-				throw SQLiteException.New (r, msg);
-			} else if (r == SQLite3.Result.Constraint && SQLite3.ExtendedErrCode (Connection.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
-				SQLite3.Reset (Statement);
-				throw NotNullConstraintViolationException.New (r, SQLite3.GetErrmsg (Connection.Handle));
-			} else {
-				SQLite3.Reset (Statement);
-				throw SQLiteException.New (r, r.ToString ());
-			}
-		}
-
-		protected virtual Sqlite3Statement Prepare ()
-		{
-			var stmt = SQLite3.Prepare2 (Connection.Handle, CommandText);
-			return stmt;
-		}
-
-		public void Dispose ()
-		{
-			Dispose (true);
-			GC.SuppressFinalize (this);
-		}
-
-		private void Dispose (bool disposing)
-		{
-			if (Statement != NullStatement) {
-				try {
-					SQLite3.Finalize (Statement);
-				} finally {
-					Statement = NullStatement;
-					Connection = null;
-				}
-			}
-		}
-
-		~PreparedSqlLiteInsertCommand ()
-		{
-			Dispose (false);
-		}
-	}
-
-	public abstract class BaseTableQuery
-	{
-		protected class Ordering
-		{
-			public string ColumnName { get; set; }
-			public bool Ascending { get; set; }
-		}
-	}
-
-	public class TableQuery<T> : BaseTableQuery, IEnumerable<T>
-	{
-		public SQLiteConnection Connection { get; private set; }
-
-		public TableMapping Table { get; private set; }
-
-		Expression _where;
-		List<Ordering> _orderBys;
-		int? _limit;
-		int? _offset;
-
-		BaseTableQuery _joinInner;
-		Expression _joinInnerKeySelector;
-		BaseTableQuery _joinOuter;
-		Expression _joinOuterKeySelector;
-		Expression _joinSelector;
-				
-		Expression _selector;
-
-		TableQuery (SQLiteConnection conn, TableMapping table)
-		{
-			Connection = conn;
-			Table = table;
-		}
-
-		public TableQuery (SQLiteConnection conn)
-		{
-			Connection = conn;
-			Table = Connection.GetMapping (typeof(T));
-		}
-
-		public TableQuery<U> Clone<U> ()
-		{
-			var q = new TableQuery<U> (Connection, Table);
-			q._where = _where;
-			q._deferred = _deferred;
-			if (_orderBys != null) {
-				q._orderBys = new List<Ordering> (_orderBys);
-			}
-			q._limit = _limit;
-			q._offset = _offset;
-			q._joinInner = _joinInner;
-			q._joinInnerKeySelector = _joinInnerKeySelector;
-			q._joinOuter = _joinOuter;
-			q._joinOuterKeySelector = _joinOuterKeySelector;
-			q._joinSelector = _joinSelector;
-			q._selector = _selector;
-			return q;
-		}
-
-		public TableQuery<T> Where (Expression<Func<T, bool>> predExpr)
-		{
-			if (predExpr.NodeType == ExpressionType.Lambda) {
-				var lambda = (LambdaExpression)predExpr;
-				var pred = lambda.Body;
-				var q = Clone<T> ();
-				q.AddWhere (pred);
-				return q;
-			} else {
-				throw new NotSupportedException ("Must be a predicate");
-			}
-		}
-
-		public TableQuery<T> Take (int n)
-		{
-			var q = Clone<T> ();
-			q._limit = n;
-			return q;
-		}
-
-		public TableQuery<T> Skip (int n)
-		{
-			var q = Clone<T> ();
-			q._offset = n;
-			return q;
-		}
-
-		public T ElementAt (int index)
-		{
-			return Skip (index).Take (1).First ();
-		}
-
-		bool _deferred;
-		public TableQuery<T> Deferred ()
-		{
-			var q = Clone<T> ();
-			q._deferred = true;
-			return q;
-		}
-
-		public TableQuery<T> OrderBy<U> (Expression<Func<T, U>> orderExpr)
-		{
-			return AddOrderBy<U> (orderExpr, true);
-		}
-
-		public TableQuery<T> OrderByDescending<U> (Expression<Func<T, U>> orderExpr)
-		{
-			return AddOrderBy<U> (orderExpr, false);
-		}
-
-		public TableQuery<T> ThenBy<U>(Expression<Func<T, U>> orderExpr)
-		{
-			return AddOrderBy<U>(orderExpr, true);
-		}
-
-		public TableQuery<T> ThenByDescending<U>(Expression<Func<T, U>> orderExpr)
-		{
-			return AddOrderBy<U>(orderExpr, false);
-		}
-
-		private TableQuery<T> AddOrderBy<U> (Expression<Func<T, U>> orderExpr, bool asc)
-		{
-			if (orderExpr.NodeType == ExpressionType.Lambda) {
-				var lambda = (LambdaExpression)orderExpr;
-				
-				MemberExpression mem = null;
-				
-				var unary = lambda.Body as UnaryExpression;
-				if (unary != null && unary.NodeType == ExpressionType.Convert) {
-					mem = unary.Operand as MemberExpression;
-				}
-				else {
-					mem = lambda.Body as MemberExpression;
-				}
-				
-				if (mem != null && (mem.Expression.NodeType == ExpressionType.Parameter)) {
-					var q = Clone<T> ();
-					if (q._orderBys == null) {
-						q._orderBys = new List<Ordering> ();
-					}
-					q._orderBys.Add (new Ordering {
-						ColumnName = Table.FindColumnWithPropertyName(mem.Member.Name).Name,
-						Ascending = asc
-					});
-					return q;
-				} else {
-					throw new NotSupportedException ("Order By does not support: " + orderExpr);
-				}
-			} else {
-				throw new NotSupportedException ("Must be a predicate");
-			}
-		}
-
-		private void AddWhere (Expression pred)
-		{
-			if (_where == null) {
-				_where = pred;
-			} else {
-				_where = Expression.AndAlso (_where, pred);
-			}
-		}
-				
-		public TableQuery<TResult> Join<TInner, TKey, TResult> (
-			TableQuery<TInner> inner,
-			Expression<Func<T, TKey>> outerKeySelector,
-			Expression<Func<TInner, TKey>> innerKeySelector,
-			Expression<Func<T, TInner, TResult>> resultSelector)
-		{
-			var q = new TableQuery<TResult> (Connection, Connection.GetMapping (typeof (TResult))) {
-				_joinOuter = this,
-				_joinOuterKeySelector = outerKeySelector,
-				_joinInner = inner,
-				_joinInnerKeySelector = innerKeySelector,
-				_joinSelector = resultSelector,
-			};
-			return q;
-		}
-				
-		public TableQuery<TResult> Select<TResult> (Expression<Func<T, TResult>> selector)
-		{
-			var q = Clone<TResult> ();
-			q._selector = selector;
-			return q;
-		}
-
-		private SQLiteCommand GenerateCommand (string selectionList)
-		{
-			if (_joinInner != null && _joinOuter != null) {
-				throw new NotSupportedException ("Joins are not supported.");
-			}
-			else {
-				var cmdText = "select " + selectionList + " from \"" + Table.TableName + "\"";
-				var args = new List<object> ();
-				if (_where != null) {
-					var w = CompileExpr (_where, args);
-					cmdText += " where " + w.CommandText;
-				}
-				if ((_orderBys != null) && (_orderBys.Count > 0)) {
-					var t = string.Join (", ", _orderBys.Select (o => "\"" + o.ColumnName + "\"" + (o.Ascending ? "" : " desc")).ToArray ());
-					cmdText += " order by " + t;
-				}
-				if (_limit.HasValue) {
-					cmdText += " limit " + _limit.Value;
-				}
-				if (_offset.HasValue) {
-					if (!_limit.HasValue) {
-						cmdText += " limit -1 ";
-					}
-					cmdText += " offset " + _offset.Value;
-				}
-				return Connection.CreateCommand (cmdText, args.ToArray ());
-			}
-		}
-
-		class CompileResult
-		{
-			public string CommandText { get; set; }
-
-			public object Value { get; set; }
-		}
-
-		private CompileResult CompileExpr (Expression expr, List<object> queryArgs)
-		{
-			if (expr == null) {
-				throw new NotSupportedException ("Expression is NULL");
-			} else if (expr is BinaryExpression) {
-				var bin = (BinaryExpression)expr;
-				
-				var leftr = CompileExpr (bin.Left, queryArgs);
-				var rightr = CompileExpr (bin.Right, queryArgs);
-
-				//If either side is a parameter and is null, then handle the other side specially (for "is null"/"is not null")
-				string text;
-				if (leftr.CommandText == "?" && leftr.Value == null)
-					text = CompileNullBinaryExpression(bin, rightr);
-				else if (rightr.CommandText == "?" && rightr.Value == null)
-					text = CompileNullBinaryExpression(bin, leftr);
-				else
-					text = "(" + leftr.CommandText + " " + GetSqlName(bin) + " " + rightr.CommandText + ")";
-				return new CompileResult { CommandText = text };
-			} else if (expr.NodeType == ExpressionType.Call) {
-				
-				var call = (MethodCallExpression)expr;
-				var args = new CompileResult[call.Arguments.Count];
-				var obj = call.Object != null ? CompileExpr (call.Object, queryArgs) : null;
-				
-				for (var i = 0; i < args.Length; i++) {
-					args [i] = CompileExpr (call.Arguments [i], queryArgs);
-				}
-				
-				var sqlCall = "";
-				
-				if (call.Method.Name == "Like" && args.Length == 2) {
-					sqlCall = "(" + args [0].CommandText + " like " + args [1].CommandText + ")";
-				}
-				else if (call.Method.Name == "Contains" && args.Length == 2) {
-					sqlCall = "(" + args [1].CommandText + " in " + args [0].CommandText + ")";
-				}
-				else if (call.Method.Name == "Contains" && args.Length == 1) {
-					if (call.Object != null && call.Object.Type == typeof(string)) {
-						sqlCall = "(" + obj.CommandText + " like ('%' || " + args [0].CommandText + " || '%'))";
-					}
-					else {
-						sqlCall = "(" + args [0].CommandText + " in " + obj.CommandText + ")";
-					}
-				}
-				else if (call.Method.Name == "StartsWith" && args.Length == 1) {
-					sqlCall = "(" + obj.CommandText + " like (" + args [0].CommandText + " || '%'))";
-				}
-				else if (call.Method.Name == "EndsWith" && args.Length == 1) {
-					sqlCall = "(" + obj.CommandText + " like ('%' || " + args [0].CommandText + "))";
-				}
-				else if (call.Method.Name == "Equals" && args.Length == 1) {
-					sqlCall = "(" + obj.CommandText + " = (" + args[0].CommandText + "))";
-				} else if (call.Method.Name == "ToLower") {
-					sqlCall = "(lower(" + obj.CommandText + "))"; 
-				} else if (call.Method.Name == "ToUpper") {
-					sqlCall = "(upper(" + obj.CommandText + "))"; 
-				} else {
-					sqlCall = call.Method.Name.ToLower () + "(" + string.Join (",", args.Select (a => a.CommandText).ToArray ()) + ")";
-				}
-				return new CompileResult { CommandText = sqlCall };
-				
-			} else if (expr.NodeType == ExpressionType.Constant) {
-				var c = (ConstantExpression)expr;
-				queryArgs.Add (c.Value);
-				return new CompileResult {
-					CommandText = "?",
-					Value = c.Value
-				};
-			} else if (expr.NodeType == ExpressionType.Convert) {
-				var u = (UnaryExpression)expr;
-				var ty = u.Type;
-				var valr = CompileExpr (u.Operand, queryArgs);
-				return new CompileResult {
-					CommandText = valr.CommandText,
-					Value = valr.Value != null ? ConvertTo (valr.Value, ty) : null
-				};
-			} else if (expr.NodeType == ExpressionType.MemberAccess) {
-				var mem = (MemberExpression)expr;
-				
-				if (mem.Expression!=null && mem.Expression.NodeType == ExpressionType.Parameter) {
-					//
-					// This is a column of our table, output just the column name
-					// Need to translate it if that column name is mapped
-					//
-					var columnName = Table.FindColumnWithPropertyName (mem.Member.Name).Name;
-					return new CompileResult { CommandText = "\"" + columnName + "\"" };
-				} else {
-					object obj = null;
-					if (mem.Expression != null) {
-						var r = CompileExpr (mem.Expression, queryArgs);
-						if (r.Value == null) {
-							throw new NotSupportedException ("Member access failed to compile expression");
-						}
-						if (r.CommandText == "?") {
-							queryArgs.RemoveAt (queryArgs.Count - 1);
-						}
-						obj = r.Value;
-					}
-					
-					//
-					// Get the member value
-					//
-					object val = null;
-					
-#if !NETFX_CORE
-					if (mem.Member.MemberType == MemberTypes.Property) {
-#else
-					if (mem.Member is PropertyInfo) {
-#endif
-						var m = (PropertyInfo)mem.Member;
-						val = m.GetValue (obj, null);
-#if !NETFX_CORE
-					} else if (mem.Member.MemberType == MemberTypes.Field) {
-#else
-					} else if (mem.Member is FieldInfo) {
-#endif
-#if SILVERLIGHT
-						val = Expression.Lambda (expr).Compile ().DynamicInvoke ();
-#else
-						var m = (FieldInfo)mem.Member;
-						val = m.GetValue (obj);
-#endif
-					} else {
-#if !NETFX_CORE
-						throw new NotSupportedException ("MemberExpr: " + mem.Member.MemberType);
-#else
-						throw new NotSupportedException ("MemberExpr: " + mem.Member.DeclaringType);
-#endif
-					}
-					
-					//
-					// Work special magic for enumerables
-					//
-					if (val != null && val is System.Collections.IEnumerable && !(val is string) && !(val is System.Collections.Generic.IEnumerable<byte>)) {
-						var sb = new System.Text.StringBuilder();
-						sb.Append("(");
-						var head = "";
-						foreach (var a in (System.Collections.IEnumerable)val) {
-							queryArgs.Add(a);
-							sb.Append(head);
-							sb.Append("?");
-							head = ",";
-						}
-						sb.Append(")");
-						return new CompileResult {
-							CommandText = sb.ToString(),
-							Value = val
-						};
-					}
-					else {
-						queryArgs.Add (val);
-						return new CompileResult {
-							CommandText = "?",
-							Value = val
-						};
-					}
-				}
-			}
-			throw new NotSupportedException ("Cannot compile: " + expr.NodeType.ToString ());
-		}
-
-		static object ConvertTo (object obj, Type t)
-		{
-			Type nut = Nullable.GetUnderlyingType(t);
-			
-			if (nut != null) {
-				if (obj == null) return null;				
-				return Convert.ChangeType (obj, nut);
-			} else {
-				return Convert.ChangeType (obj, t);
-			}
-		}
-
-		/// <summary>
-		/// Compiles a BinaryExpression where one of the parameters is null.
-		/// </summary>
-		/// <param name="parameter">The non-null parameter</param>
-		private string CompileNullBinaryExpression(BinaryExpression expression, CompileResult parameter)
-		{
-			if (expression.NodeType == ExpressionType.Equal)
-				return "(" + parameter.CommandText + " is ?)";
-			else if (expression.NodeType == ExpressionType.NotEqual)
-				return "(" + parameter.CommandText + " is not ?)";
-			else
-				throw new NotSupportedException("Cannot compile Null-BinaryExpression with type " + expression.NodeType.ToString());
-		}
-
-		string GetSqlName (Expression expr)
-		{
-			var n = expr.NodeType;
-			if (n == ExpressionType.GreaterThan)
-				return ">"; else if (n == ExpressionType.GreaterThanOrEqual) {
-				return ">=";
-			} else if (n == ExpressionType.LessThan) {
-				return "<";
-			} else if (n == ExpressionType.LessThanOrEqual) {
-				return "<=";
-			} else if (n == ExpressionType.And) {
-				return "&";
-			} else if (n == ExpressionType.AndAlso) {
-				return "and";
-			} else if (n == ExpressionType.Or) {
-				return "|";
-			} else if (n == ExpressionType.OrElse) {
-				return "or";
-			} else if (n == ExpressionType.Equal) {
-				return "=";
-			} else if (n == ExpressionType.NotEqual) {
-				return "!=";
-			} else {
-				throw new NotSupportedException ("Cannot get SQL for: " + n);
-			}
-		}
-		
-		public int Count ()
-		{
-			return GenerateCommand("count(*)").ExecuteScalar<int> ();			
-		}
-
-		public int Count (Expression<Func<T, bool>> predExpr)
-		{
-			return Where (predExpr).Count ();
-		}
-
-		public IEnumerator<T> GetEnumerator ()
-		{
-			if (!_deferred)
-				return GenerateCommand("*").ExecuteQuery<T>().GetEnumerator();
-
-			return GenerateCommand("*").ExecuteDeferredQuery<T>().GetEnumerator();
-		}
-
-		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator ()
-		{
-			return GetEnumerator ();
-		}
-
-		public T First ()
-		{
-			var query = Take (1);
-			return query.ToList<T>().First ();
-		}
-
-		public T FirstOrDefault ()
-		{
-			var query = Take (1);
-			return query.ToList<T>().FirstOrDefault ();
-		}
-    }
-
-	public static class SQLite3
-	{
-		public enum Result : int
-		{
-			OK = 0,
-			Error = 1,
-			Internal = 2,
-			Perm = 3,
-			Abort = 4,
-			Busy = 5,
-			Locked = 6,
-			NoMem = 7,
-			ReadOnly = 8,
-			Interrupt = 9,
-			IOError = 10,
-			Corrupt = 11,
-			NotFound = 12,
-			Full = 13,
-			CannotOpen = 14,
-			LockErr = 15,
-			Empty = 16,
-			SchemaChngd = 17,
-			TooBig = 18,
-			Constraint = 19,
-			Mismatch = 20,
-			Misuse = 21,
-			NotImplementedLFS = 22,
-			AccessDenied = 23,
-			Format = 24,
-			Range = 25,
-			NonDBFile = 26,
-			Notice = 27,
-			Warning = 28,
-			Row = 100,
-			Done = 101
-		}
-
-		public enum ExtendedResult : int
-		{
-			IOErrorRead = (Result.IOError | (1 << 8)),
-			IOErrorShortRead = (Result.IOError | (2 << 8)),
-			IOErrorWrite = (Result.IOError | (3 << 8)),
-			IOErrorFsync = (Result.IOError | (4 << 8)),
-			IOErrorDirFSync = (Result.IOError | (5 << 8)),
-			IOErrorTruncate = (Result.IOError | (6 << 8)),
-			IOErrorFStat = (Result.IOError | (7 << 8)),
-			IOErrorUnlock = (Result.IOError | (8 << 8)),
-			IOErrorRdlock = (Result.IOError | (9 << 8)),
-			IOErrorDelete = (Result.IOError | (10 << 8)),
-			IOErrorBlocked = (Result.IOError | (11 << 8)),
-			IOErrorNoMem = (Result.IOError | (12 << 8)),
-			IOErrorAccess = (Result.IOError | (13 << 8)),
-			IOErrorCheckReservedLock = (Result.IOError | (14 << 8)),
-			IOErrorLock = (Result.IOError | (15 << 8)),
-			IOErrorClose = (Result.IOError | (16 << 8)),
-			IOErrorDirClose = (Result.IOError | (17 << 8)),
-			IOErrorSHMOpen = (Result.IOError | (18 << 8)),
-			IOErrorSHMSize = (Result.IOError | (19 << 8)),
-			IOErrorSHMLock = (Result.IOError | (20 << 8)),
-			IOErrorSHMMap = (Result.IOError | (21 << 8)),
-			IOErrorSeek = (Result.IOError | (22 << 8)),
-			IOErrorDeleteNoEnt = (Result.IOError | (23 << 8)),
-			IOErrorMMap = (Result.IOError | (24 << 8)),
-			LockedSharedcache = (Result.Locked | (1 << 8)),
-			BusyRecovery = (Result.Busy | (1 << 8)),
-			CannottOpenNoTempDir = (Result.CannotOpen | (1 << 8)),
-			CannotOpenIsDir = (Result.CannotOpen | (2 << 8)),
-			CannotOpenFullPath = (Result.CannotOpen | (3 << 8)),
-			CorruptVTab = (Result.Corrupt | (1 << 8)),
-			ReadonlyRecovery = (Result.ReadOnly | (1 << 8)),
-			ReadonlyCannotLock = (Result.ReadOnly | (2 << 8)),
-			ReadonlyRollback = (Result.ReadOnly | (3 << 8)),
-			AbortRollback = (Result.Abort | (2 << 8)),
-			ConstraintCheck = (Result.Constraint | (1 << 8)),
-			ConstraintCommitHook = (Result.Constraint | (2 << 8)),
-			ConstraintForeignKey = (Result.Constraint | (3 << 8)),
-			ConstraintFunction = (Result.Constraint | (4 << 8)),
-			ConstraintNotNull = (Result.Constraint | (5 << 8)),
-			ConstraintPrimaryKey = (Result.Constraint | (6 << 8)),
-			ConstraintTrigger = (Result.Constraint | (7 << 8)),
-			ConstraintUnique = (Result.Constraint | (8 << 8)),
-			ConstraintVTab = (Result.Constraint | (9 << 8)),
-			NoticeRecoverWAL = (Result.Notice | (1 << 8)),
-			NoticeRecoverRollback = (Result.Notice | (2 << 8))
-		}
-        
-
-		public enum ConfigOption : int
-		{
-			SingleThread = 1,
-			MultiThread = 2,
-			Serialized = 3
-		}
-
-#if !USE_CSHARP_SQLITE && !USE_WP8_NATIVE_SQLITE
-		[DllImport("sqlite3", EntryPoint = "sqlite3_open", CallingConvention=CallingConvention.Cdecl)]
-		public static extern Result Open ([MarshalAs(UnmanagedType.LPStr)] string filename, out IntPtr db);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_open_v2", CallingConvention=CallingConvention.Cdecl)]
-		public static extern Result Open ([MarshalAs(UnmanagedType.LPStr)] string filename, out IntPtr db, int flags, IntPtr zvfs);
-		
-		[DllImport("sqlite3", EntryPoint = "sqlite3_open_v2", CallingConvention = CallingConvention.Cdecl)]
-		public static extern Result Open(byte[] filename, out IntPtr db, int flags, IntPtr zvfs);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_open16", CallingConvention = CallingConvention.Cdecl)]
-		public static extern Result Open16([MarshalAs(UnmanagedType.LPWStr)] string filename, out IntPtr db);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_enable_load_extension", CallingConvention=CallingConvention.Cdecl)]
-		public static extern Result EnableLoadExtension (IntPtr db, int onoff);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_close", CallingConvention=CallingConvention.Cdecl)]
-		public static extern Result Close (IntPtr db);
-		
-		[DllImport("sqlite3", EntryPoint = "sqlite3_initialize", CallingConvention=CallingConvention.Cdecl)]
-		public static extern Result Initialize();
-						
-		[DllImport("sqlite3", EntryPoint = "sqlite3_shutdown", CallingConvention=CallingConvention.Cdecl)]
-		public static extern Result Shutdown();
-		
-		[DllImport("sqlite3", EntryPoint = "sqlite3_config", CallingConvention=CallingConvention.Cdecl)]
-		public static extern Result Config (ConfigOption option);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_win32_set_directory", CallingConvention=CallingConvention.Cdecl, CharSet=CharSet.Unicode)]
-		public static extern int SetDirectory (uint directoryType, string directoryPath);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_busy_timeout", CallingConvention=CallingConvention.Cdecl)]
-		public static extern Result BusyTimeout (IntPtr db, int milliseconds);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_changes", CallingConvention=CallingConvention.Cdecl)]
-		public static extern int Changes (IntPtr db);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_prepare_v2", CallingConvention=CallingConvention.Cdecl)]
-		public static extern Result Prepare2 (IntPtr db, [MarshalAs(UnmanagedType.LPStr)] string sql, int numBytes, out IntPtr stmt, IntPtr pzTail);
-
-#if NETFX_CORE
-		[DllImport ("sqlite3", EntryPoint = "sqlite3_prepare_v2", CallingConvention = CallingConvention.Cdecl)]
-		public static extern Result Prepare2 (IntPtr db, byte[] queryBytes, int numBytes, out IntPtr stmt, IntPtr pzTail);
-#endif
-
-		public static IntPtr Prepare2 (IntPtr db, string query)
-		{
-			IntPtr stmt;
-#if NETFX_CORE
-            byte[] queryBytes = System.Text.UTF8Encoding.UTF8.GetBytes (query);
-            var r = Prepare2 (db, queryBytes, queryBytes.Length, out stmt, IntPtr.Zero);
-#else
-            var r = Prepare2 (db, query, System.Text.UTF8Encoding.UTF8.GetByteCount (query), out stmt, IntPtr.Zero);
-#endif
-			if (r != Result.OK) {
-				throw SQLiteException.New (r, GetErrmsg (db));
-			}
-			return stmt;
-		}
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_step", CallingConvention=CallingConvention.Cdecl)]
-		public static extern Result Step (IntPtr stmt);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_reset", CallingConvention=CallingConvention.Cdecl)]
-		public static extern Result Reset (IntPtr stmt);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_finalize", CallingConvention=CallingConvention.Cdecl)]
-		public static extern Result Finalize (IntPtr stmt);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_last_insert_rowid", CallingConvention=CallingConvention.Cdecl)]
-		public static extern long LastInsertRowid (IntPtr db);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_errmsg16", CallingConvention=CallingConvention.Cdecl)]
-		public static extern IntPtr Errmsg (IntPtr db);
-
-		public static string GetErrmsg (IntPtr db)
-		{
-			return Marshal.PtrToStringUni (Errmsg (db));
-		}
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_bind_parameter_index", CallingConvention=CallingConvention.Cdecl)]
-		public static extern int BindParameterIndex (IntPtr stmt, [MarshalAs(UnmanagedType.LPStr)] string name);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_bind_null", CallingConvention=CallingConvention.Cdecl)]
-		public static extern int BindNull (IntPtr stmt, int index);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_bind_int", CallingConvention=CallingConvention.Cdecl)]
-		public static extern int BindInt (IntPtr stmt, int index, int val);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_bind_int64", CallingConvention=CallingConvention.Cdecl)]
-		public static extern int BindInt64 (IntPtr stmt, int index, long val);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_bind_double", CallingConvention=CallingConvention.Cdecl)]
-		public static extern int BindDouble (IntPtr stmt, int index, double val);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_bind_text16", CallingConvention=CallingConvention.Cdecl, CharSet = CharSet.Unicode)]
-		public static extern int BindText (IntPtr stmt, int index, [MarshalAs(UnmanagedType.LPWStr)] string val, int n, IntPtr free);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_bind_blob", CallingConvention=CallingConvention.Cdecl)]
-		public static extern int BindBlob (IntPtr stmt, int index, byte[] val, int n, IntPtr free);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_column_count", CallingConvention=CallingConvention.Cdecl)]
-		public static extern int ColumnCount (IntPtr stmt);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_column_name", CallingConvention=CallingConvention.Cdecl)]
-		public static extern IntPtr ColumnName (IntPtr stmt, int index);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_column_name16", CallingConvention=CallingConvention.Cdecl)]
-		static extern IntPtr ColumnName16Internal (IntPtr stmt, int index);
-		public static string ColumnName16(IntPtr stmt, int index)
-		{
-			return Marshal.PtrToStringUni(ColumnName16Internal(stmt, index));
-		}
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_column_type", CallingConvention=CallingConvention.Cdecl)]
-		public static extern ColType ColumnType (IntPtr stmt, int index);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_column_int", CallingConvention=CallingConvention.Cdecl)]
-		public static extern int ColumnInt (IntPtr stmt, int index);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_column_int64", CallingConvention=CallingConvention.Cdecl)]
-		public static extern long ColumnInt64 (IntPtr stmt, int index);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_column_double", CallingConvention=CallingConvention.Cdecl)]
-		public static extern double ColumnDouble (IntPtr stmt, int index);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_column_text", CallingConvention=CallingConvention.Cdecl)]
-		public static extern IntPtr ColumnText (IntPtr stmt, int index);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_column_text16", CallingConvention=CallingConvention.Cdecl)]
-		public static extern IntPtr ColumnText16 (IntPtr stmt, int index);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_column_blob", CallingConvention=CallingConvention.Cdecl)]
-		public static extern IntPtr ColumnBlob (IntPtr stmt, int index);
-
-		[DllImport("sqlite3", EntryPoint = "sqlite3_column_bytes", CallingConvention=CallingConvention.Cdecl)]
-		public static extern int ColumnBytes (IntPtr stmt, int index);
-
-		public static string ColumnString (IntPtr stmt, int index)
-		{
-			return Marshal.PtrToStringUni (SQLite3.ColumnText16 (stmt, index));
-		}
-
-		public static byte[] ColumnByteArray (IntPtr stmt, int index)
-		{
-			int length = ColumnBytes (stmt, index);
-			var result = new byte[length];
-			if (length > 0)
-				Marshal.Copy (ColumnBlob (stmt, index), result, 0, length);
-			return result;
-		}
-
-		[DllImport ("sqlite3", EntryPoint = "sqlite3_extended_errcode", CallingConvention = CallingConvention.Cdecl)]
-		public static extern ExtendedResult ExtendedErrCode (IntPtr db);
-
-		[DllImport ("sqlite3", EntryPoint = "sqlite3_libversion_number", CallingConvention = CallingConvention.Cdecl)]
-		public static extern int LibVersionNumber ();
-#else
-		public static Result Open(string filename, out Sqlite3DatabaseHandle db)
-		{
-			return (Result) Sqlite3.sqlite3_open(filename, out db);
-		}
-
-		public static Result Open(string filename, out Sqlite3DatabaseHandle db, int flags, IntPtr zVfs)
-		{
-#if USE_WP8_NATIVE_SQLITE
-			return (Result)Sqlite3.sqlite3_open_v2(filename, out db, flags, "");
-#else
-			return (Result)Sqlite3.sqlite3_open_v2(filename, out db, flags, null);
-#endif
-		}
-
-		public static Result Close(Sqlite3DatabaseHandle db)
-		{
-			return (Result)Sqlite3.sqlite3_close(db);
-		}
-
-		public static Result BusyTimeout(Sqlite3DatabaseHandle db, int milliseconds)
-		{
-			return (Result)Sqlite3.sqlite3_busy_timeout(db, milliseconds);
-		}
-
-		public static int Changes(Sqlite3DatabaseHandle db)
-		{
-			return Sqlite3.sqlite3_changes(db);
-		}
-
-		public static Sqlite3Statement Prepare2(Sqlite3DatabaseHandle db, string query)
-		{
-			Sqlite3Statement stmt = default(Sqlite3Statement);
-#if USE_WP8_NATIVE_SQLITE
-			var r = Sqlite3.sqlite3_prepare_v2(db, query, out stmt);
-#else
-			stmt = new Sqlite3Statement();
-			var r = Sqlite3.sqlite3_prepare_v2(db, query, -1, ref stmt, 0);
-#endif
-			if (r != 0)
-			{
-				throw SQLiteException.New((Result)r, GetErrmsg(db));
-			}
-			return stmt;
-		}
-
-		public static Result Step(Sqlite3Statement stmt)
-		{
-			return (Result)Sqlite3.sqlite3_step(stmt);
-		}
-
-		public static Result Reset(Sqlite3Statement stmt)
-		{
-			return (Result)Sqlite3.sqlite3_reset(stmt);
-		}
-
-		public static Result Finalize(Sqlite3Statement stmt)
-		{
-			return (Result)Sqlite3.sqlite3_finalize(stmt);
-		}
-
-		public static long LastInsertRowid(Sqlite3DatabaseHandle db)
-		{
-			return Sqlite3.sqlite3_last_insert_rowid(db);
-		}
-
-		public static string GetErrmsg(Sqlite3DatabaseHandle db)
-		{
-			return Sqlite3.sqlite3_errmsg(db);
-		}
-
-		public static int BindParameterIndex(Sqlite3Statement stmt, string name)
-		{
-			return Sqlite3.sqlite3_bind_parameter_index(stmt, name);
-		}
-
-		public static int BindNull(Sqlite3Statement stmt, int index)
-		{
-			return Sqlite3.sqlite3_bind_null(stmt, index);
-		}
-
-		public static int BindInt(Sqlite3Statement stmt, int index, int val)
-		{
-			return Sqlite3.sqlite3_bind_int(stmt, index, val);
-		}
-
-		public static int BindInt64(Sqlite3Statement stmt, int index, long val)
-		{
-			return Sqlite3.sqlite3_bind_int64(stmt, index, val);
-		}
-
-		public static int BindDouble(Sqlite3Statement stmt, int index, double val)
-		{
-			return Sqlite3.sqlite3_bind_double(stmt, index, val);
-		}
-
-		public static int BindText(Sqlite3Statement stmt, int index, string val, int n, IntPtr free)
-		{
-#if USE_WP8_NATIVE_SQLITE
-			return Sqlite3.sqlite3_bind_text(stmt, index, val, n);
-#else
-			return Sqlite3.sqlite3_bind_text(stmt, index, val, n, null);
-#endif
-		}
-
-		public static int BindBlob(Sqlite3Statement stmt, int index, byte[] val, int n, IntPtr free)
-		{
-#if USE_WP8_NATIVE_SQLITE
-			return Sqlite3.sqlite3_bind_blob(stmt, index, val, n);
-#else
-			return Sqlite3.sqlite3_bind_blob(stmt, index, val, n, null);
-#endif
-		}
-
-		public static int ColumnCount(Sqlite3Statement stmt)
-		{
-			return Sqlite3.sqlite3_column_count(stmt);
-		}
-
-		public static string ColumnName(Sqlite3Statement stmt, int index)
-		{
-			return Sqlite3.sqlite3_column_name(stmt, index);
-		}
-
-		public static string ColumnName16(Sqlite3Statement stmt, int index)
-		{
-			return Sqlite3.sqlite3_column_name(stmt, index);
-		}
-
-		public static ColType ColumnType(Sqlite3Statement stmt, int index)
-		{
-			return (ColType)Sqlite3.sqlite3_column_type(stmt, index);
-		}
-
-		public static int ColumnInt(Sqlite3Statement stmt, int index)
-		{
-			return Sqlite3.sqlite3_column_int(stmt, index);
-		}
-
-		public static long ColumnInt64(Sqlite3Statement stmt, int index)
-		{
-			return Sqlite3.sqlite3_column_int64(stmt, index);
-		}
-
-		public static double ColumnDouble(Sqlite3Statement stmt, int index)
-		{
-			return Sqlite3.sqlite3_column_double(stmt, index);
-		}
-
-		public static string ColumnText(Sqlite3Statement stmt, int index)
-		{
-			return Sqlite3.sqlite3_column_text(stmt, index);
-		}
-
-		public static string ColumnText16(Sqlite3Statement stmt, int index)
-		{
-			return Sqlite3.sqlite3_column_text(stmt, index);
-		}
-
-		public static byte[] ColumnBlob(Sqlite3Statement stmt, int index)
-		{
-			return Sqlite3.sqlite3_column_blob(stmt, index);
-		}
-
-		public static int ColumnBytes(Sqlite3Statement stmt, int index)
-		{
-			return Sqlite3.sqlite3_column_bytes(stmt, index);
-		}
-
-		public static string ColumnString(Sqlite3Statement stmt, int index)
-		{
-			return Sqlite3.sqlite3_column_text(stmt, index);
-		}
-
-		public static byte[] ColumnByteArray(Sqlite3Statement stmt, int index)
-		{
-			return ColumnBlob(stmt, index);
-		}
-
-		public static Result EnableLoadExtension(Sqlite3DatabaseHandle db, int onoff)
-		{
-			return (Result)Sqlite3.sqlite3_enable_load_extension(db, onoff);
-		}
-
-		public static ExtendedResult ExtendedErrCode(Sqlite3DatabaseHandle db)
-		{
-			return (ExtendedResult)Sqlite3.sqlite3_extended_errcode(db);
-		}
-#endif
-
-		public enum ColType : int
-		{
-			Integer = 1,
-			Float = 2,
-			Text = 3,
-			Blob = 4,
-			Null = 5
-		}
-	}
-}
diff --git a/NadekoBot/SQLiteAsync.cs b/NadekoBot/SQLiteAsync.cs
deleted file mode 100644
index 79b91cba..00000000
--- a/NadekoBot/SQLiteAsync.cs
+++ /dev/null
@@ -1,503 +0,0 @@
-//
-// Copyright (c) 2012 Krueger Systems, Inc.
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace SQLite
-{
-	public partial class SQLiteAsyncConnection
-	{
-		SQLiteConnectionString _connectionString;
-        SQLiteOpenFlags _openFlags;
-
-        public SQLiteAsyncConnection(string databasePath, bool storeDateTimeAsTicks = false)
-            : this(databasePath, SQLiteOpenFlags.ReadWrite | SQLiteOpenFlags.Create, storeDateTimeAsTicks)
-        {
-        }
-        
-        public SQLiteAsyncConnection(string databasePath, SQLiteOpenFlags openFlags, bool storeDateTimeAsTicks = false)
-        {
-            _openFlags = openFlags;
-            _connectionString = new SQLiteConnectionString(databasePath, storeDateTimeAsTicks);
-        }
-
-		SQLiteConnectionWithLock GetConnection ()
-		{
-			return SQLiteConnectionPool.Shared.GetConnection (_connectionString, _openFlags);
-		}
-
-		public Task<CreateTablesResult> CreateTableAsync<T> ()
-			where T : new ()
-		{
-			return CreateTablesAsync (typeof (T));
-		}
-
-		public Task<CreateTablesResult> CreateTablesAsync<T, T2> ()
-			where T : new ()
-			where T2 : new ()
-		{
-			return CreateTablesAsync (typeof (T), typeof (T2));
-		}
-
-		public Task<CreateTablesResult> CreateTablesAsync<T, T2, T3> ()
-			where T : new ()
-			where T2 : new ()
-			where T3 : new ()
-		{
-			return CreateTablesAsync (typeof (T), typeof (T2), typeof (T3));
-		}
-
-		public Task<CreateTablesResult> CreateTablesAsync<T, T2, T3, T4> ()
-			where T : new ()
-			where T2 : new ()
-			where T3 : new ()
-			where T4 : new ()
-		{
-			return CreateTablesAsync (typeof (T), typeof (T2), typeof (T3), typeof (T4));
-		}
-
-		public Task<CreateTablesResult> CreateTablesAsync<T, T2, T3, T4, T5> ()
-			where T : new ()
-			where T2 : new ()
-			where T3 : new ()
-			where T4 : new ()
-			where T5 : new ()
-		{
-			return CreateTablesAsync (typeof (T), typeof (T2), typeof (T3), typeof (T4), typeof (T5));
-		}
-
-		public Task<CreateTablesResult> CreateTablesAsync (params Type[] types)
-		{
-			return Task.Factory.StartNew (() => {
-				CreateTablesResult result = new CreateTablesResult ();
-				var conn = GetConnection ();
-				using (conn.Lock ()) {
-					foreach (Type type in types) {
-						int aResult = conn.CreateTable (type);
-						result.Results[type] = aResult;
-					}
-				}
-				return result;
-			});
-		}
-
-		public Task<int> DropTableAsync<T> ()
-			where T : new ()
-		{
-			return Task.Factory.StartNew (() => {
-				var conn = GetConnection ();
-				using (conn.Lock ()) {
-					return conn.DropTable<T> ();
-				}
-			});
-		}
-
-		public Task<int> InsertAsync (object item)
-		{
-			return Task.Factory.StartNew (() => {
-				var conn = GetConnection ();
-				using (conn.Lock ()) {
-					return conn.Insert (item);
-				}
-			});
-		}
-
-		public Task<int> UpdateAsync (object item)
-		{
-			return Task.Factory.StartNew (() => {
-				var conn = GetConnection ();
-				using (conn.Lock ()) {
-					return conn.Update (item);
-				}
-			});
-		}
-
-		public Task<int> DeleteAsync (object item)
-		{
-			return Task.Factory.StartNew (() => {
-				var conn = GetConnection ();
-				using (conn.Lock ()) {
-					return conn.Delete (item);
-				}
-			});
-		}
-
-        public Task<T> GetAsync<T>(object pk)
-            where T : new()
-        {
-            return Task.Factory.StartNew(() =>
-            {
-                var conn = GetConnection();
-                using (conn.Lock())
-                {
-                    return conn.Get<T>(pk);
-                }
-            });
-        }
-
-		public Task<T> FindAsync<T> (object pk)
-			where T : new ()
-		{
-			return Task.Factory.StartNew (() => {
-				var conn = GetConnection ();
-				using (conn.Lock ()) {
-					return conn.Find<T> (pk);
-				}
-			});
-		}
-		
-		public Task<T> GetAsync<T> (Expression<Func<T, bool>> predicate)
-            where T : new()
-        {
-            return Task.Factory.StartNew(() =>
-            {
-                var conn = GetConnection();
-                using (conn.Lock())
-                {
-                    return conn.Get<T> (predicate);
-                }
-            });
-        }
-
-		public Task<T> FindAsync<T> (Expression<Func<T, bool>> predicate)
-			where T : new ()
-		{
-			return Task.Factory.StartNew (() => {
-				var conn = GetConnection ();
-				using (conn.Lock ()) {
-					return conn.Find<T> (predicate);
-				}
-			});
-		}
-
-		public Task<int> ExecuteAsync (string query, params object[] args)
-		{
-			return Task<int>.Factory.StartNew (() => {
-				var conn = GetConnection ();
-				using (conn.Lock ()) {
-					return conn.Execute (query, args);
-				}
-			});
-		}
-
-		public Task<int> InsertAllAsync (IEnumerable items)
-		{
-			return Task.Factory.StartNew (() => {
-				var conn = GetConnection ();
-				using (conn.Lock ()) {
-					return conn.InsertAll (items);
-				}
-			});
-		}
-		
-		public Task<int> UpdateAllAsync (IEnumerable items)
-		{
-			return Task.Factory.StartNew (() => {
-				var conn = GetConnection ();
-				using (conn.Lock ()) {
-					return conn.UpdateAll (items);
-				}
-			});
-		}
-
-        [Obsolete("Will cause a deadlock if any call in action ends up in a different thread. Use RunInTransactionAsync(Action<SQLiteConnection>) instead.")]
-		public Task RunInTransactionAsync (Action<SQLiteAsyncConnection> action)
-		{
-			return Task.Factory.StartNew (() => {
-				var conn = this.GetConnection ();
-				using (conn.Lock ()) {
-					conn.BeginTransaction ();
-					try {
-						action (this);
-						conn.Commit ();
-					}
-					catch (Exception) {
-						conn.Rollback ();
-						throw;
-					}
-				}
-			});
-		}
-
-        public Task RunInTransactionAsync(Action<SQLiteConnection> action)
-        {
-            return Task.Factory.StartNew(() =>
-            {
-                var conn = this.GetConnection();
-                using (conn.Lock())
-                {
-                    conn.BeginTransaction();
-                    try
-                    {
-                        action(conn);
-                        conn.Commit();
-                    }
-                    catch (Exception)
-                    {
-                        conn.Rollback();
-                        throw;
-                    }
-                }
-            });
-        }
-
-		public AsyncTableQuery<T> Table<T> ()
-			where T : new ()
-		{
-			//
-			// This isn't async as the underlying connection doesn't go out to the database
-			// until the query is performed. The Async methods are on the query iteself.
-			//
-			var conn = GetConnection ();
-			return new AsyncTableQuery<T> (conn.Table<T> ());
-		}
-
-		public Task<T> ExecuteScalarAsync<T> (string sql, params object[] args)
-		{
-			return Task<T>.Factory.StartNew (() => {
-				var conn = GetConnection ();
-				using (conn.Lock ()) {
-					var command = conn.CreateCommand (sql, args);
-					return command.ExecuteScalar<T> ();
-				}
-			});
-		}
-
-		public Task<List<T>> QueryAsync<T> (string sql, params object[] args)
-			where T : new ()
-		{
-			return Task<List<T>>.Factory.StartNew (() => {
-				var conn = GetConnection ();
-				using (conn.Lock ()) {
-					return conn.Query<T> (sql, args);
-				}
-			});
-		}
-	}
-
-	//
-	// TODO: Bind to AsyncConnection.GetConnection instead so that delayed
-	// execution can still work after a Pool.Reset.
-	//
-	public class AsyncTableQuery<T>
-		where T : new ()
-	{
-		TableQuery<T> _innerQuery;
-
-		public AsyncTableQuery (TableQuery<T> innerQuery)
-		{
-			_innerQuery = innerQuery;
-		}
-
-		public AsyncTableQuery<T> Where (Expression<Func<T, bool>> predExpr)
-		{
-			return new AsyncTableQuery<T> (_innerQuery.Where (predExpr));
-		}
-
-		public AsyncTableQuery<T> Skip (int n)
-		{
-			return new AsyncTableQuery<T> (_innerQuery.Skip (n));
-		}
-
-		public AsyncTableQuery<T> Take (int n)
-		{
-			return new AsyncTableQuery<T> (_innerQuery.Take (n));
-		}
-
-		public AsyncTableQuery<T> OrderBy<U> (Expression<Func<T, U>> orderExpr)
-		{
-			return new AsyncTableQuery<T> (_innerQuery.OrderBy<U> (orderExpr));
-		}
-
-		public AsyncTableQuery<T> OrderByDescending<U> (Expression<Func<T, U>> orderExpr)
-		{
-			return new AsyncTableQuery<T> (_innerQuery.OrderByDescending<U> (orderExpr));
-		}
-
-		public Task<List<T>> ToListAsync ()
-		{
-			return Task.Factory.StartNew (() => {
-				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
-					return _innerQuery.ToList ();
-				}
-			});
-		}
-
-		public Task<int> CountAsync ()
-		{
-			return Task.Factory.StartNew (() => {
-				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
-					return _innerQuery.Count ();
-				}
-			});
-		}
-
-		public Task<T> ElementAtAsync (int index)
-		{
-			return Task.Factory.StartNew (() => {
-				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
-					return _innerQuery.ElementAt (index);
-				}
-			});
-		}
-
-		public Task<T> FirstAsync ()
-		{
-			return Task<T>.Factory.StartNew(() => {
-				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
-					return _innerQuery.First ();
-				}
-			});
-		}
-
-		public Task<T> FirstOrDefaultAsync ()
-		{
-			return Task<T>.Factory.StartNew(() => {
-				using (((SQLiteConnectionWithLock)_innerQuery.Connection).Lock ()) {
-					return _innerQuery.FirstOrDefault ();
-				}
-			});
-		}
-    }
-
-	public class CreateTablesResult
-	{
-		public Dictionary<Type, int> Results { get; private set; }
-
-		internal CreateTablesResult ()
-		{
-			this.Results = new Dictionary<Type, int> ();
-		}
-	}
-
-	class SQLiteConnectionPool
-	{
-		class Entry
-		{
-			public SQLiteConnectionString ConnectionString { get; private set; }
-			public SQLiteConnectionWithLock Connection { get; private set; }
-
-            public Entry (SQLiteConnectionString connectionString, SQLiteOpenFlags openFlags)
-			{
-				ConnectionString = connectionString;
-				Connection = new SQLiteConnectionWithLock (connectionString, openFlags);
-			}
-
-			public void OnApplicationSuspended ()
-			{
-				Connection.Dispose ();
-				Connection = null;
-			}
-		}
-
-		readonly Dictionary<string, Entry> _entries = new Dictionary<string, Entry> ();
-		readonly object _entriesLock = new object ();
-
-		static readonly SQLiteConnectionPool _shared = new SQLiteConnectionPool ();
-
-		/// <summary>
-		/// Gets the singleton instance of the connection tool.
-		/// </summary>
-		public static SQLiteConnectionPool Shared
-		{
-			get
-			{
-				return _shared;
-			}
-		}
-
-		public SQLiteConnectionWithLock GetConnection (SQLiteConnectionString connectionString, SQLiteOpenFlags openFlags)
-		{
-			lock (_entriesLock) {
-				Entry entry;
-				string key = connectionString.ConnectionString;
-
-				if (!_entries.TryGetValue (key, out entry)) {
-					entry = new Entry (connectionString, openFlags);
-					_entries[key] = entry;
-				}
-
-				return entry.Connection;
-			}
-		}
-
-		/// <summary>
-		/// Closes all connections managed by this pool.
-		/// </summary>
-		public void Reset ()
-		{
-			lock (_entriesLock) {
-				foreach (var entry in _entries.Values) {
-					entry.OnApplicationSuspended ();
-				}
-				_entries.Clear ();
-			}
-		}
-
-		/// <summary>
-		/// Call this method when the application is suspended.
-		/// </summary>
-		/// <remarks>Behaviour here is to close any open connections.</remarks>
-		public void ApplicationSuspended ()
-		{
-			Reset ();
-		}
-	}
-
-	class SQLiteConnectionWithLock : SQLiteConnection
-	{
-		readonly object _lockPoint = new object ();
-
-        public SQLiteConnectionWithLock (SQLiteConnectionString connectionString, SQLiteOpenFlags openFlags)
-			: base (connectionString.DatabasePath, openFlags, connectionString.StoreDateTimeAsTicks)
-		{
-		}
-
-		public IDisposable Lock ()
-		{
-			return new LockWrapper (_lockPoint);
-		}
-
-		private class LockWrapper : IDisposable
-		{
-			object _lockPoint;
-
-			public LockWrapper (object lockPoint)
-			{
-				_lockPoint = lockPoint;
-				Monitor.Enter (_lockPoint);
-			}
-
-			public void Dispose ()
-			{
-				Monitor.Exit (_lockPoint);
-			}
-		}
-	}
-}
-
diff --git a/NadekoBot/_Models/DataModels/TestDataModel.cs b/NadekoBot/_Models/DataModels/TestDataModel.cs
new file mode 100644
index 00000000..247743ca
--- /dev/null
+++ b/NadekoBot/_Models/DataModels/TestDataModel.cs
@@ -0,0 +1,8 @@
+namespace NadekoBot.DataModels
+{
+    internal class TestDataModel : IDataModel
+    {
+        public long TestNumber { get; set; }
+        public string TestString { get; set; }
+    }
+}
diff --git a/NadekoBot/bin/Debug/sqlite3.dll b/NadekoBot/bin/Debug/sqlite3.dll
deleted file mode 100644
index 59e84a1c..00000000
Binary files a/NadekoBot/bin/Debug/sqlite3.dll and /dev/null differ
diff --git a/NadekoBot/bin/Debug/x64/esqlite3.dll b/NadekoBot/bin/Debug/x64/esqlite3.dll
new file mode 100644
index 00000000..dd396d02
Binary files /dev/null and b/NadekoBot/bin/Debug/x64/esqlite3.dll differ
diff --git a/NadekoBot/bin/Debug/x86/esqlite3.dll b/NadekoBot/bin/Debug/x86/esqlite3.dll
new file mode 100644
index 00000000..e5e53ff7
Binary files /dev/null and b/NadekoBot/bin/Debug/x86/esqlite3.dll differ
diff --git a/NadekoBot/packages.config b/NadekoBot/packages.config
index 9a7951bf..b59d511f 100644
--- a/NadekoBot/packages.config
+++ b/NadekoBot/packages.config
@@ -10,7 +10,12 @@
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="8.0.3" targetFramework="net46" />
   <package id="RestSharp" version="105.2.3" targetFramework="net452" />
-  <package id="sqlite-net" version="1.0.8" targetFramework="net452" />
+  <package id="sqlite-net-pcl" version="1.1.2" targetFramework="net452" />
+  <package id="SQLitePCL.bundle_green" version="0.9.2" targetFramework="net452" />
+  <package id="SQLitePCL.native.sqlite3.v110_xp" version="0.9.2" targetFramework="net452" />
+  <package id="SQLitePCL.plugin.sqlite3.net45" version="0.9.2" targetFramework="net452" />
+  <package id="SQLitePCL.raw" version="0.9.2" targetFramework="net452" />
+  <package id="System.Data.SQLite" version="1.0.102.0" targetFramework="net452" />
   <package id="taglib" version="2.1.0.0" targetFramework="net452" />
   <package id="VideoLibrary" version="1.3.3" targetFramework="net452" />
 </packages>
\ No newline at end of file
diff --git a/commandlist.md b/commandlist.md
index d055dc88..fd405bd1 100644
--- a/commandlist.md
+++ b/commandlist.md
@@ -1,62 +1,63 @@
 ######For more information and how to setup your own NadekoBot, go to: **http://github.com/Kwoth/NadekoBot/**
-######You can donate on paypal: `nadekodiscordbot@gmail.com`
+######You can donate on patreon: `https://patreon.com/nadekobot`
+######or paypal: `nadekodiscordbot@gmail.com`
 
 #NadekoBot List Of Commands  
-Version: `NadekoBot v0.9.6051.26856`
+Version: `NadekoBot v0.9.6054.4837`
 ### Help  
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
-`-h`, `-help`, `@BotName help`, `@BotName h`, `~h`  |  Either shows a help for a single command, or PMs you help link if no arguments are specified. |  '-h !m q' or just '-h' 
-`-hgit`  |  Generates the commandlist.md file. **Bot Owner Only!**
-`-readme`, `-guide`  |  Sends a readme and a guide links to the channel.
-`-donate`, `~donate`  |  Instructions for helping the project!
-`-modules`, `.modules`  |  List all bot modules.
-`-commands`, `.commands`  |  List all of the bot's commands from a certain module.
+`-h`, `-help`, `@BotName help`, `@BotName h`, `~h`  |  Either shows a help for a single command, or PMs you help link if no arguments are specified. |  `-h !m q` or just `-h` 
+`-hgit`  |  Generates the commandlist.md file. **Bot Owner Only!** |  `-hgit`
+`-readme`, `-guide`  |  Sends a readme and a guide links to the channel. |  `-readme` or `-guide`
+`-donate`, `~donate`  |  Instructions for helping the project! |  `{Prefix}donate` or `~donate`
+`-modules`, `.modules`  |  List all bot modules. |  `{Prefix}modules` or `.modules`
+`-commands`, `.commands`  |  List all of the bot's commands from a certain module. |  `{Prefix}commands` or `.commands`
 
 ### Administration  
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
-`.grdel`  |  Toggles automatic deletion of greet and bye messages.
-`.greet`  |  Toggles anouncements on the current channel when someone joins the server.
-`.greetmsg`  |  Sets a new join announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. |  .greetmsg Welcome to the server, %user%.
-`.bye`  |  Toggles anouncements on the current channel when someone leaves the server.
-`.byemsg`  |  Sets a new leave announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current bye message. |  .byemsg %user% has left the server.
-`.byepm`  |  Toggles whether the good bye messages will be sent in a PM or in the text channel.
-`.greetpm`  |  Toggles whether the greet messages will be sent in a PM or in the text channel.
-`.spmom`  |  Toggles whether mentions of other offline users on your server will send a pm to them.
-`.logserver`  |  Toggles logging in this channel. Logs every message sent/deleted/edited on the server. **Bot Owner Only!**
-`.logignore`  |  Toggles whether the .logserver command ignores this channel. Useful if you have hidden admin channel and public log channel.
-`.userpresence`  |  Starts logging to this channel when someone from the server goes online/offline/idle.
-`.voicepresence`  |  Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now.
-`.repeatinvoke`, `.repinv`  |  Immediately shows the repeat message and restarts the timer.
+`.grdel`  |  Toggles automatic deletion of greet and bye messages. |  `.grdel`
+`.greet`  |  Toggles anouncements on the current channel when someone joins the server. |  `.greet`
+`.greetmsg`  |  Sets a new join announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. |  `.greetmsg Welcome to the server, %user%.`
+`.bye`  |  Toggles anouncements on the current channel when someone leaves the server. |  `.bye`
+`.byemsg`  |  Sets a new leave announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current bye message. |  `.byemsg %user% has left the server.`
+`.byepm`  |  Toggles whether the good bye messages will be sent in a PM or in the text channel. |  `.byepm`
+`.greetpm`  |  Toggles whether the greet messages will be sent in a PM or in the text channel. |  `.greetpm`
+`.spmom`  |  Toggles whether mentions of other offline users on your server will send a pm to them. |  `.spmom`
+`.logserver`  |  Toggles logging in this channel. Logs every message sent/deleted/edited on the server. **Bot Owner Only!** |  `.logserver`
+`.logignore`  |  Toggles whether the .logserver command ignores this channel. Useful if you have hidden admin channel and public log channel. |  `.logignore`
+`.userpresence`  |  Starts logging to this channel when someone from the server goes online/offline/idle. |  `.userpresence`
+`.voicepresence`  |  Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now. |  `{Prefix}voicerpresence`
+`.repeatinvoke`, `.repinv`  |  Immediately shows the repeat message and restarts the timer. |  `{Prefix}repinv`
 `.repeat`  |  Repeat a message every X minutes. If no parameters are specified, repeat is disabled. Requires manage messages. | `.repeat 5 Hello there`
-`.rotateplaying`, `.ropl`  |  Toggles rotation of playing status of the dynamic strings you specified earlier.
-`.addplaying`, `.adpl`  |  Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %trivia%
-`.listplaying`, `.lipl`  |  Lists all playing statuses with their corresponding number.
-`.removeplaying`, `.repl`, `.rmpl`  |  Removes a playing string on a given number.
-`.slowmode`  |  Toggles slow mode. When ON, users will be able to send only 1 message every 5 seconds.
-`.cleanv+t`, `.cv+t`  |  Deletes all text channels ending in `-voice` for which voicechannels are not found. **Use at your own risk.**
-`.voice+text`, `.v+t`  |  Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless.
-`.scsc`  |  Starts an instance of cross server channel. You will get a token as a DMthat other people will use to tune in to the same instance
-`.jcsc`  |  Joins current channel to an instance of cross server channel using the token.
-`.lcsc`  |  Leaves Cross server channel instance from this channel
+`.rotateplaying`, `.ropl`  |  Toggles rotation of playing status of the dynamic strings you specified earlier. |  `.ropl`
+`.addplaying`, `.adpl`  |  Adds a specified string to the list of playing strings to rotate. Supported placeholders: %servers%, %users%, %playing%, %queued%, %trivia% |  `.adpl`
+`.listplaying`, `.lipl`  |  Lists all playing statuses with their corresponding number. |  `.lipl`
+`.removeplaying`, `.repl`, `.rmpl`  |  Removes a playing string on a given number. |  `.rmpl`
+`.slowmode`  |  Toggles slow mode. When ON, users will be able to send only 1 message every 5 seconds. |  `.slowmode`
+`.cleanv+t`, `.cv+t`  |  Deletes all text channels ending in `-voice` for which voicechannels are not found. **Use at your own risk.** |  `.cleanv+t`
+`.voice+text`, `.v+t`  |  Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless. |  `.voice+text`
+`.scsc`  |  Starts an instance of cross server channel. You will get a token as a DM that other people will use to tune in to the same instance. |  `.scsc`
+`.jcsc`  |  Joins current channel to an instance of cross server channel using the token. |  `.jcsc`
+`.lcsc`  |  Leaves Cross server channel instance from this channel. |  `.lcsc`
 `.asar`  |  Adds a role, or list of roles separated by whitespace(use quotations for multiword roles) to the list of self-assignable roles. |  .asar Gamer
-`.rsar`  |  Removes a specified role from the list of self-assignable roles.
-`.lsar`  |  Lists all self-assignable roles.
-`.togglexclsar`, `.tesar`  |  toggle whether the self-assigned roles should be exclusive
+`.rsar`  |  Removes a specified role from the list of self-assignable roles. |  `.rsar`
+`.lsar`  |  Lists all self-assignable roles. |  `.lsar`
+`.togglexclsar`, `.tesar`  |  toggle whether the self-assigned roles should be exclusive |  `.tesar`
 `.iam`  |  Adds a role to you that you choose. Role must be on a list of self-assignable roles. |  .iam Gamer
 `.iamnot`, `.iamn`  |  Removes a role to you that you choose. Role must be on a list of self-assignable roles. |  .iamn Gamer
-`.addcustreact`, `.acr`  |  Add a custom reaction. Guide here: <https://github.com/Kwoth/NadekoBot/wiki/Custom-Reactions> **Bot Owner Only!**   |  .acr "hello" I love saying hello to %user%
-`.listcustreact`, `.lcr`  |  Lists custom reactions (paginated with 30 commands per page). Use 'all' instead of page number to get all custom reactions DM-ed to you.  | .lcr 1
-`.showcustreact`, `.scr`  |  Shows all possible responses from a single custom reaction. | .scr %mention% bb
+`.addcustreact`, `.acr`  |  Add a custom reaction. Guide here: <https://github.com/Kwoth/NadekoBot/wiki/Custom-Reactions> **Bot Owner Only!**   |  `.acr "hello" I love saying hello to %user%`
+`.listcustreact`, `.lcr`  |  Lists custom reactions (paginated with 30 commands per page). Use 'all' instead of page number to get all custom reactions DM-ed to you.  | `.lcr 1`
+`.showcustreact`, `.scr`  |  Shows all possible responses from a single custom reaction. | `.scr %mention% bb`
 `.editcustreact`, `.ecr`  |  Edits a custom reaction, arguments are custom reactions name, index to change, and a (multiword) message **Bot Owner Only** |  `.ecr "%mention% disguise" 2 Test 123`
-`.delcustreact`, `.dcr`  |  Deletes a custom reaction with given name (and index)
+`.delcustreact`, `.dcr`  |  Deletes a custom reaction with given name (and index). |  `.dcr index`
 `.autoassignrole`, `.aar`  |  Automaticaly assigns a specified role to every user who joins the server. Type `.aar` to disable, `.aar Role Name` to enable
 `.leave`  |  Makes Nadeko leave the server. Either name or id required. |  `.leave 123123123331`
-`.listincidents`, `.lin`  |  List all UNREAD incidents and flags them as read.
-`.listallincidents`, `.lain`  |  Sends you a file containing all incidents and flags them as read.
-`.delmsgoncmd`  |  Toggles the automatic deletion of user's successful command message to prevent chat flood. Server Manager Only.
-`.restart`  |  Restarts the bot. Might not work. **Bot Owner Only**
+`.listincidents`, `.lin`  |  List all UNREAD incidents and flags them as read. |  `.lin`
+`.listallincidents`, `.lain`  |  Sends you a file containing all incidents and flags them as read. |  `.lain`
+`.delmsgoncmd`  |  Toggles the automatic deletion of user's successful command message to prevent chat flood. Server Manager Only. |  `.delmsgoncmd`
+`.restart`  |  Restarts the bot. Might not work. **Bot Owner Only** |  `.restart`
 `.setrole`, `.sr`  |  Sets a role for a given user. |  `.sr @User Guest`
 `.removerole`, `.rr`  |  Removes a role from a given user. |  `.rr @User Admin`
 `.renamerole`, `.renr`  |  Renames a role. Role you are renaming must be lower than bot's highest role. |  `.renr "First role" SecondRole`
@@ -76,15 +77,15 @@ Command and aliases |  Description |  Usage
 `.creatxtchanl`, `.ctch`  |  Creates a new text channel with a given name. |  `.ctch TextChannelName`
 `.settopic`, `.st`  |  Sets a topic on the current channel. |  `.st My new topic`
 `.setchanlname`, `.schn`  |  Changed the name of the current channel.| `.schn NewName`
-`.heap`  |  Shows allocated memory - **Bot Owner Only!**
+`.heap`  |  Shows allocated memory - **Bot Owner Only!** |  `.heap`
 `.prune`, `.clr`  |  `.prune` removes all nadeko's messages in the last 100 messages.`.prune X` removes last X messages from the channel (up to 100)`.prune @Someone` removes all Someone's messages in the last 100 messages.`.prune @Someone X` removes last X 'Someone's' messages in the channel. |  `.prune` or `.prune 5` or `.prune @Someone` or `.prune @Someone X`
-`.die`  |  Shuts the bot down and notifies users about the restart. **Bot Owner Only!**
+`.die`  |  Shuts the bot down and notifies users about the restart. **Bot Owner Only!** |  `.die`
 `.setname`, `.newnm`  |  Give the bot a new name. **Bot Owner Only!** |  .newnm BotName
 `.newavatar`, `.setavatar`  |  Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. **Bot Owner Only!** |  `.setavatar https://i.ytimg.com/vi/WDudkR1eTMM/maxresdefault.jpg`
 `.setgame`  |  Sets the bots game. **Bot Owner Only!** |  `.setgame Playing with kwoth`
 `.send`  |  Send a message to someone on a different server through the bot. **Bot Owner Only!** |  `.send serverid|u:user_id Send this to a user!` or `.send serverid|c:channel_id Send this to a channel!`
 `.mentionrole`, `.menro`  |  Mentions every person from the provided role or roles (separated by a ',') on this server. Requires you to have mention everyone permission. |  `.menro RoleName`
-`.unstuck`  |  Clears the message queue. **Bot Owner Only!**
+`.unstuck`  |  Clears the message queue. **Bot Owner Only!** |  `.unstuck`
 `.donators`  |  List of lovely people who donated to keep this project alive.
 `.donadd`  |  Add a donator to the database. |  `.donadd Donate Amount`
 `.announce`  |  Sends a message to all servers' general channel bot is connected to.**Bot Owner Only!** |  `.announce Useless spam`
@@ -94,16 +95,16 @@ Command and aliases |  Description |  Usage
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
 `.remind`  |  Sends a message to you or a channel after certain amount of time. First argument is me/here/'channelname'. Second argument is time in a descending order (mo>w>d>h>m) example: 1w5d3h10m. Third argument is a (multiword)message.  |  `.remind me 1d5h Do something` or `.remind #general Start now!`
-`.remindmsg`  |  Sets message for when the remind is triggered.  Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind. **Bot Owner Only!**
-`.serverinfo`, `.sinfo`  |  Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. | .sinfo Some Server
-`.channelinfo`, `.cinfo`  |  Shows info about the channel. If no channel is supplied, it defaults to current one. | .cinfo #some-channel
-`.userinfo`, `.uinfo`  |  Shows info about the user. If no user is supplied, it defaults a user running the command. | .uinfo @SomeUser
+`.remindmsg`  |  Sets message for when the remind is triggered.  Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind. **Bot Owner Only!** |  `.remindmsg do something else`
+`.serverinfo`, `.sinfo`  |  Shows info about the server the bot is on. If no channel is supplied, it defaults to current one. | `.sinfo Some Server`
+`.channelinfo`, `.cinfo`  |  Shows info about the channel. If no channel is supplied, it defaults to current one. | `.cinfo #some-channel`
+`.userinfo`, `.uinfo`  |  Shows info about the user. If no user is supplied, it defaults a user running the command. | `.uinfo @SomeUser`
 `.whoplays`  |  Shows a list of users who are playing the specified game. |  `.whoplays Overwatch`
 `.inrole`  |  Lists every person from the provided role or roles (separated by a ',') on this server. If the list is too long for 1 message, you must have Manage Messages permission. |  `.inrole Role`
-`.checkmyperms`  |  Checks your userspecific permissions on this channel.
-`.stats`  |  Shows some basic stats for Nadeko.
-`.dysyd`  |  Shows some basic stats for Nadeko.
-`.userid`, `.uid`  |  Shows user ID. |  `.uid` or `.uid "@SomeGuy"
+`.checkmyperms`  |  Checks your userspecific permissions on this channel. |  `.checkmyperms`
+`.stats`  |  Shows some basic stats for Nadeko. |  `.stats`
+`.dysyd`  |  Shows some basic stats for Nadeko. |  `.dysyd`
+`.userid`, `.uid`  |  Shows user ID. |  `.uid` or `.uid "@SomeGuy"`
 `.channelid`, `.cid`  |  Shows current channel ID. |  `.cid`
 `.serverid`, `.sid`  |  Shows current server ID. |  `.sid`
 `.roles`  |  List all roles on this server or a single user if specified.
@@ -119,12 +120,12 @@ Command and aliases |  Description |  Usage
 `;rmvfilterword`, `;rfw`  |  Removes the word from the list of filtered words |  ;rw poop
 `;lstfilterwords`, `;lfw`  |  Shows a list of filtered words |  ;lfw
 `;srvrfilterwords`, `;sfw`  |  Enables or disables automatic deleting of messages containing forbidden words on the server. |  ;sfw disable
-`;permrole`, `;pr`  |  Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'.
+`;permrole`, `;pr`  |  Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'. |  `;pr role`
 `;rolepermscopy`, `;rpc`  |  Copies BOT PERMISSIONS (not discord permissions) from one role to another. | `;rpc Some Role ~ Some other role`
 `;chnlpermscopy`, `;cpc`  |  Copies BOT PERMISSIONS (not discord permissions) from one channel to another. | `;cpc Some Channel ~ Some other channel`
 `;usrpermscopy`, `;upc`  |  Copies BOT PERMISSIONS (not discord permissions) from one role to another. | `;upc @SomeUser ~ @SomeOtherUser`
 `;verbose`, `;v`  |  Sets whether to show when a command/module is blocked. |  `;verbose true`
-`;srvrperms`, `;sp`  |  Shows banned permissions for this server.
+`;srvrperms`, `;sp`  |  Shows banned permissions for this server. |  `;sp`
 `;roleperms`, `;rp`  |  Shows banned permissions for a certain role. No argument means for everyone. |  `;rp AwesomeRole`
 `;chnlperms`, `;cp`  |  Shows banned permissions for a certain channel. No argument means for this channel. |  `;cp #dev`
 `;userperms`, `;up`  |  Shows banned permissions for a certain user. No argument means for yourself. |  `;up Kwoth`
@@ -157,48 +158,48 @@ Command and aliases |  Description |  Usage
 `...`  |  Shows a random quote with a specified name. |  `... abc`
 `..qdel`, `..quotedelete`  |  Deletes all quotes with the specified keyword. You have to either be bot owner or the creator of the quote to delete it. |  `..qdel abc`
 `@BotName rip`  |  Shows a grave image of someone with a start year |  @NadekoBot rip @Someone 2000
-`@BotName die`  |  Works only for the owner. Shuts the bot down.
-`@BotName do you love me`  |  Replies with positive answer only to the bot owner.
-`@BotName how are you`, `@BotName how are you?`  |  Replies positive only if bot owner is online.
-`@BotName fire`  |  Shows a unicode fire message. Optional parameter [x] tells her how many times to repeat the fire. |  @NadekoBot fire [x]
-`@BotName dump`  |  Dumps all of the invites it can to dump.txt.** Owner Only.**
-`@BotName ab`  |  Try to get 'abalabahaha'
+`@BotName die`  |  Works only for the owner. Shuts the bot down. |  `@NadekoBot die`
+`@BotName do you love me`  |  Replies with positive answer only to the bot owner. |  `@NadekoBot do you love me`
+`@BotName how are you`, `@BotName how are you?`  |  Replies positive only if bot owner is online. |  `@NadekoBot how are you`
+`@BotName fire`  |  Shows a unicode fire message. Optional parameter [x] tells her how many times to repeat the fire. |  `@NadekoBot fire [x]`
+`@BotName dump`  |  Dumps all of the invites it can to dump.txt.** Owner Only.** |  `@NadekoBot dump`
+`@BotName ab`  |  Try to get 'abalabahaha'| `@NadekoBot ab`
 
 ### Gambling  
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
-`$draw`  |  Draws a card from the deck.If you supply number [x], she draws up to 5 cards from the deck. |  $draw [x]
-`$shuffle`, `$sh`  |  Reshuffles all cards back into the deck.
+`$draw`  |  Draws a card from the deck.If you supply number [x], she draws up to 5 cards from the deck. |  `$draw [x]`
+`$shuffle`, `$sh`  |  Reshuffles all cards back into the deck.|`$shuffle`
 `$flip`  |  Flips coin(s) - heads or tails, and shows an image. |  `$flip` or `$flip 3`
 `$betflip`, `$bf`  |  Bet to guess will the result be heads or tails. Guessing award you double flowers you've bet. |  `$bf 5 heads` or `$bf 3 t`
-`$roll`  |  Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. |  $roll or $roll 7 or $roll 3d5
-`$rolluo`  |  Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice (unordered). If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. |  $roll or $roll 7 or $roll 3d5
+`$roll`  |  Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice. If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. |  `$roll` or `$roll 7` or `$roll 3d5`
+`$rolluo`  |  Rolls 0-100. If you supply a number [x] it rolls up to 30 normal dice (unordered). If you split 2 numbers with letter d (xdy) it will roll x dice from 1 to y. |  `$roll` or `$roll` 7 or `$roll 3d5`
 `$nroll`  |  Rolls in a given range. |  `$nroll 5` (rolls 0-5) or `$nroll 5-15`
-`$race`  |  Starts a new animal race.
+`$race`  |  Starts a new animal race. |  `$race`
 `$joinrace`, `$jr`  |  Joins a new race. You can specify an amount of flowers for betting (optional). You will get YourBet*(participants-1) back if you win. |  `$jr` or `$jr 5`
-`$raffle`  |  Prints a name and ID of a random user from the online list from the (optional) role. |  `$raffle` or `$raffle RoleName
+`$raffle`  |  Prints a name and ID of a random user from the online list from the (optional) role. |  `$raffle` or `$raffle RoleName`
 `$$$`  |  Check how much NadekoFlowers a person has. (Defaults to yourself) | `$$$` or `$$$ @Someone`
-`$give`  |  Give someone a certain amount of NadekoFlowers
+`$give`  |  Give someone a certain amount of NadekoFlowers|`$give 1 "@SomeGuy"`
 `$award`  |  Gives someone a certain amount of flowers. **Bot Owner Only!** |  `$award 100 @person`
 `$take`  |  Takes a certain amount of flowers from someone. **Bot Owner Only!** |  `$take 1 "@someguy"`
-`$betroll`, `$br`  |  Bets a certain amount of NadekoFlowers and rolls a dice. Rolling over 66 yields x2 flowers, over 90 - x3 and 100 x10. |  $br 5
-`$leaderboard`, `$lb`  |  
+`$betroll`, `$br`  |  Bets a certain amount of NadekoFlowers and rolls a dice. Rolling over 66 yields x2 flowers, over 90 - x3 and 100 x10. |  `$br 5`
+`$leaderboard`, `$lb`  |  Displays bot currency leaderboard |  $lb
 
 ### Games  
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
 `>t`  |  Starts a game of trivia. You can add nohint to prevent hints.First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question. | `>t nohint` or `>t 5 nohint`
-`>tl`  |  Shows a current trivia leaderboard.
-`>tq`  |  Quits current trivia after current question.
-`>typestart`  |  Starts a typing contest.
-`>typestop`  |  Stops a typing contest on the current channel.
-`>typeadd`  |  Adds a new article to the typing contest. Owner only.
-`>poll`  |  Creates a poll, only person who has manage server permission can do it. |  >poll Question?;Answer1;Answ 2;A_3
-`>pollend`  |  Stops active poll on this server and prints the results in this channel.
-`>pick`  |  Picks a flower planted in this channel.
-`>plant`  |  Spend a flower to plant it in this channel. (If bot is restarted or crashes, flower will be lost)
+`>tl`  |  Shows a current trivia leaderboard. |  `>tl`
+`>tq`  |  Quits current trivia after current question. |  `>tq`
+`>typestart`  |  Starts a typing contest. |  `>typestart`
+`>typestop`  |  Stops a typing contest on the current channel. |  `>typestop`
+`>typeadd`  |  Adds a new article to the typing contest. Owner only. |  `>typeadd wordswords`
+`>poll`  |  Creates a poll, only person who has manage server permission can do it. |  `>poll Question?;Answer1;Answ 2;A_3`
+`>pollend`  |  Stops active poll on this server and prints the results in this channel. |  `>pollend`
+`>pick`  |  Picks a flower planted in this channel. |  `>pick`
+`>plant`  |  Spend a flower to plant it in this channel. (If bot is restarted or crashes, flower will be lost) |  `>plant`
 `>gencurrency`, `>gc`  |  Toggles currency generation on this channel. Every posted message will have 2% chance to spawn a NadekoFlower. Optional parameter cooldown time in minutes, 5 minutes by default. Requires Manage Messages permission. |  `>gc` or `>gc 60`
-`>leet`  |  Converts a text to leetspeak with 6 (1-6) severity levels |  >leet 3 Hello
+`>leet`  |  Converts a text to leetspeak with 6 (1-6) severity levels |  `>leet 3 Hello`
 `>choose`  |  Chooses a thing from a list of things |  `>choose Get up;Sleep;Sleep more`
 `>8ball`  |  Ask the 8ball a yes/no question. |  `>8ball should i do something`
 `>rps`  |  Play a game of rocket paperclip scissors with Nadeko. |  `>rps scissors`
@@ -237,37 +238,37 @@ Command and aliases |  Description |  Usage
 `!!load`  |  Loads a playlist under a certain name.  |  `!!load classical-1`
 `!!playlists`, `!!pls`  |  Lists all playlists. Paginated. 20 per page. Default page is 0. | `!!pls 1`
 `!!deleteplaylist`, `!!delpls`  |  Deletes a saved playlist. Only if you made it or if you are the bot owner. |  `!!delpls animu-5`
-`!!goto`  |  Goes to a specific time in seconds in a song. |  !!goto 30
+`!!goto`  |  Goes to a specific time in seconds in a song. |  `!!goto 30`
 `!!getlink`, `!!gl`  |  Shows a link to the currently playing song.
 `!!autoplay`, `!!ap`  |  Toggles autoplay - When the song is finished, automatically queue a related youtube song. (Works only for youtube songs and when queue is empty)
 
 ### Searches  
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
-`~lolchamp`  |  Shows League Of Legends champion statistics. If there are spaces/apostrophes or in the name - omit them. Optional second parameter is a role. | ~lolchamp Riven or ~lolchamp Annie sup
-`~lolban`  |  Shows top 6 banned champions ordered by ban rate. Ban these champions and you will be Plat 5 in no time.
-`~hitbox`, `~hb`  |  Notifies this channel when a certain user starts streaming. |  ~hitbox SomeStreamer
-`~twitch`, `~tw`  |  Notifies this channel when a certain user starts streaming. |  ~twitch SomeStreamer
-`~beam`, `~bm`  |  Notifies this channel when a certain user starts streaming. |  ~beam SomeStreamer
-`~checkhitbox`, `~chhb`  |  Checks if a certain user is streaming on the hitbox platform. |  ~chhb SomeStreamer
-`~checktwitch`, `~chtw`  |  Checks if a certain user is streaming on the twitch platform. |  ~chtw SomeStreamer
-`~checkbeam`, `~chbm`  |  Checks if a certain user is streaming on the beam platform. |  ~chbm SomeStreamer
-`~removestream`, `~rms`  |  Removes notifications of a certain streamer on this channel. |  ~rms SomeGuy
-`~liststreams`, `~ls`  |  Lists all streams you are following on this server. |  ~ls
-`~convert`  |  Convert quantities from>to. Like `~convert m>km 1000`
+`~lolchamp`  |  Shows League Of Legends champion statistics. If there are spaces/apostrophes or in the name - omit them. Optional second parameter is a role. | `~lolchamp Riven` or `~lolchamp Annie sup`
+`~lolban`  |  Shows top 6 banned champions ordered by ban rate. Ban these champions and you will be Plat 5 in no time. |  `~lolban`
+`~hitbox`, `~hb`  |  Notifies this channel when a certain user starts streaming. |  `~hitbox SomeStreamer`
+`~twitch`, `~tw`  |  Notifies this channel when a certain user starts streaming. |  `~twitch SomeStreamer`
+`~beam`, `~bm`  |  Notifies this channel when a certain user starts streaming. |  `~beam SomeStreamer`
+`~checkhitbox`, `~chhb`  |  Checks if a certain user is streaming on the hitbox platform. |  `~chhb SomeStreamer`
+`~checktwitch`, `~chtw`  |  Checks if a certain user is streaming on the twitch platform. |  `~chtw SomeStreamer`
+`~checkbeam`, `~chbm`  |  Checks if a certain user is streaming on the beam platform. |  `~chbm SomeStreamer`
+`~removestream`, `~rms`  |  Removes notifications of a certain streamer on this channel. |  `~rms SomeGuy`
+`~liststreams`, `~ls`  |  Lists all streams you are following on this server. |  `~ls`
+`~convert`  |  Convert quantities from>to. |  `~convert m>km 1000`
 `~convertlist`  |  List of the convertable dimensions and currencies.
-`~wowjoke`  |  Get one of Kwoth's penultimate WoW jokes.
+`~wowjoke`  |  Get one of Kwoth's penultimate WoW jokes. |  `~wowjoke`
 `~calculate`, `~calc`  |  Evaluate a mathematical expression. |  ~calc 1+1
 `~osu`  |  Shows osu stats for a player. |  `~osu Name` or `~osu Name taiko`
-`~osu b`  |  Shows information about an osu beatmap. | ~osu b https://osu.ppy.sh/s/127712
+`~osu b`  |  Shows information about an osu beatmap. | `~osu b` https://osu.ppy.sh/s/127712`
 `~osu top5`  |  Displays a user's top 5 plays.  | ~osu top5 Name
-`~pokemon`, `~poke`  |  Searches for a pokemon.
-`~pokemonability`, `~pokeab`  |  Searches for a pokemon ability.
-`~memelist`  |  Pulls a list of memes you can use with `~memegen` from http://memegen.link/templates/
+`~pokemon`, `~poke`  |  Searches for a pokemon. |  `~poke Sylveon`
+`~pokemonability`, `~pokeab`  |  Searches for a pokemon ability. |  `~pokeab "water gun"`
+`~memelist`  |  Pulls a list of memes you can use with `~memegen` from http://memegen.link/templates/ |  `~memelist`
 `~memegen`  |  Generates a meme from memelist with top and bottom text. |  `~memegen biw "gets iced coffee" "in the winter"`
 `~we`  |  Shows weather data for a specified city and a country. BOTH ARE REQUIRED. Use country abbrevations. |  `~we Moscow RF`
 `~yt`  |  Searches youtubes and shows the first result |  `~yt query`
-`~ani`, `~anime`, `~aq`  |  Queries anilist for an anime and shows the first result.
+`~ani`, `~anime`, `~aq`  |  Queries anilist for an anime and shows the first result. |  `~aq aquerion evol`
 `~imdb`  |  Queries imdb for movies or series, show first result. |  `~imdb query`
 `~mang`, `~manga`, `~mq`  |  Queries anilist for a manga and shows the first result. |  `~mq query`
 `~randomcat`, `~meow`  |  Shows a random cat image.
@@ -279,13 +280,13 @@ Command and aliases |  Description |  Usage
 `~hs`  |  Searches for a Hearthstone card and shows its image. Takes a while to complete. |  `~hs Ysera`
 `~ud`  |  Searches Urban Dictionary for a word. |  `~ud Pineapple`
 `~#`  |  Searches Tagdef.com for a hashtag. |  `~# ff`
-`~quote`  |  Shows a random quote.
-`~catfact`  |  Shows a random catfact from <http://catfacts-api.appspot.com/api/facts>
-`~yomama`, `~ym`  |  Shows a random joke from <http://api.yomomma.info/>
-`~randjoke`, `~rj`  |  Shows a random joke from <http://tambal.azurewebsites.net/joke/random>
-`~chucknorris`, `~cn`  |  Shows a random chucknorris joke from <http://tambal.azurewebsites.net/joke/random>
-`~magicitem`, `~mi`  |  Shows a random magicitem from <https://1d4chan.org/wiki/List_of_/tg/%27s_magic_items>
-`~revav`  |  Returns a google reverse image search for someone's avatar. |  `~revav "@SomeGuy"
+`~quote`  |  Shows a random quote. |  `~quote`
+`~catfact`  |  Shows a random catfact from <http://catfacts-api.appspot.com/api/facts> |  `~catfact`
+`~yomama`, `~ym`  |  Shows a random joke from <http://api.yomomma.info/> |  `~ym`
+`~randjoke`, `~rj`  |  Shows a random joke from <http://tambal.azurewebsites.net/joke/random> |  `~rj`
+`~chucknorris`, `~cn`  |  Shows a random chucknorris joke from <http://tambal.azurewebsites.net/joke/random> |  `~cn`
+`~magicitem`, `~mi`  |  Shows a random magicitem from <https://1d4chan.org/wiki/List_of_/tg/%27s_magic_items> |  `~mi`
+`~revav`  |  Returns a google reverse image search for someone's avatar. |  `~revav "@SomeGuy"`
 `~revimg`  |  Returns a google reverse image search for an image from a link. |  `~revav Image link`
 `~safebooru`  |  Shows a random image from safebooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) |  `~safebooru yuri+kissing`
 `~wiki`  |  Gives you back a wikipedia link |  `~wiki query`
@@ -301,15 +302,15 @@ Command and aliases |  Description |  Usage
 `~gelbooru`  |  Shows a random hentai image from gelbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +) |  `~gelbooru yuri+kissing`
 `~rule34`  |  Shows a random image from rule34.xx with a given tag. Tag is optional but preffered. (multiple tags are appended with +) |  `~rule34 yuri+kissing`
 `~e621`  |  Shows a random hentai image from e621.net with a given tag. Tag is optional but preffered. Use spaces for multiple tags. |  `~e621 yuri kissing`
-`~cp`  |  We all know where this will lead you to.
-`~boobs`  |  Real adult content.
-`~butts`, `~ass`, `~butt`  |  Real adult content.
+`~cp`  |  We all know where this will lead you to. |  `~cp`
+`~boobs`  |  Real adult content. |  `~boobs`
+`~butts`, `~ass`, `~butt`  |  Real adult content. |  `~butts` or `~ass`
 
 ### ClashOfClans  
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
 `,createwar`, `,cw`  |  Creates a new war by specifying a size (>10 and multiple of 5) and enemy clan name. | ,cw 15 The Enemy Clan
-`,startwar`, `,sw`  |  Starts a war with a given number. |  `,sw 1`
+`,startwar`, `,sw`  |  Starts a war with a given number.
 `,listwar`, `,lw`  |  Shows the active war claims by a number. Shows all wars in a short way if no number is specified. |  ,lw [war_number] or ,lw
 `,claim`, `,call`, `,c`  |  Claims a certain base from a certain war. You can supply a name in the third optional argument to claim in someone else's place.  |  ,call [war_number] [base_number] [optional_other_name]
 `,claimfinish`, `,cf`, `,cf3`, `,claimfinish3`  |  Finish your claim with 3 stars if you destroyed a base. Optional second argument finishes for someone else. |  ,cf [war_number] [optional_other_name]
@@ -322,16 +323,16 @@ Command and aliases |  Description |  Usage
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
 `>attack`  |  Attacks a target with the given move. Use `>movelist` to see a list of moves your type can use. |  `>attack "vine whip" @someguy`
-`>movelist`, `>ml`  |  Lists the moves you are able to use
-`>heal`  |  Heals someone. Revives those who fainted. Costs a NadekoFlower |  >heal @someone
-`>type`  |  Get the poketype of the target. |  >type @someone
-`>settype`  |  Set your poketype. Costs a NadekoFlower. |  >settype fire
+`>movelist`, `>ml`  |  Lists the moves you are able to use |  `>ml`
+`>heal`  |  Heals someone. Revives those who fainted. Costs a NadekoFlower |  `>heal @someone`
+`>type`  |  Get the poketype of the target. |  `>type @someone`
+`>settype`  |  Set your poketype. Costs a NadekoFlower. |  `>settype fire`
 
 ### Translator  
 Command and aliases |  Description |  Usage
 ----------------|--------------|-------
 `~translate`, `~trans`  |  Translates from>to text. From the given language to the destiation language. |  `~trans en>fr Hello`
-`~translangs`  |  List the valid languages for translation.
+`~translangs`  |  List the valid languages for translation. |  `{Prefix}translangs` or `{Prefix}translangs language`
 
 ### Customreactions  
 Command and aliases |  Description |  Usage