diff --git a/bot.js b/bot.js
index 5449597..086258b 100644
--- a/bot.js
+++ b/bot.js
@@ -87,7 +87,15 @@ function subredditRequest(subreddit)
         if(req.readyState == 4 && req.status == 200)
         {
             var json = JSON.parse(req.responseText);
-            returnText = json.data.children[getRandomInt(0,json.data.children.length-1)].data.url;
+            while(true)
+            {
+                var i = getRandomInt(0,json.data.children.length-1);
+                if(json.data.children[i].data.post_hint === "image" || json.data.children[i].data.post_hint === "link" || json.data.children.data.post_hint === "rich:video")
+                {
+                    returnText = json.data.children[i].data.url;
+                    break;
+                }
+            }
         }
     }
 
@@ -285,6 +293,9 @@ client.on('message', message => {
             case 'dankmemes':
                 message.channel.send((Math.floor(Math.random() * 2) == 0) ? subredditRequest('dankmemes') : imgurRequest('dankmemes', 5));
                 break;
+            case 'testcommand':
+                message.channel.send(subredditRequest('Nekomimi', 5));
+                break;
 
             // SFW Anime Image commands
             case 'meirl':
@@ -297,7 +308,7 @@ client.on('message', message => {
                 message.channel.send((Math.floor(Math.random() * 2) == 0) ? subredditRequest('cuteanimeboys') : imgurRequest('cuteanimeboys', 1));
                 break;
             case 'hotguys':
-                message.channel.send(redditbooruRequest('bishounen'));
+                message.channel.send((Math.floor(Math.random() * 2) == 0) ? redditbooruRequest('bishounen') : subredditRequest('bishounen'));
                 break;
             case 'kgirls':
                 message.channel.send((Math.floor(Math.random() * 2) == 0) ? redditbooruRequest('kpics') : imgurRequest('kpics', 5));
@@ -314,7 +325,7 @@ client.on('message', message => {
                 message.channel.send((Math.floor(Math.random() * 2) == 0) ? subredditRequest('ecchi') : imgurRequest('ecchi', 5));
                 break;
             case 'hentai':
-                message.channel.send((Math.floor(Math.random() * 2) == 0) ? imgurRequest('hentai', 5) : imgurRequest('Sukebei', 5));
+                message.channel.send((Math.floor(Math.random() * 2) == 0) ? imgurRequest('hentai', 5) : ((Math.floor(Math.random() * 2) == 0) ? imgurRequest('Sukebei', 5) : subredditRequest('hentai', 5)));
                 break;
             case 'yaoi':
                 message.channel.send(imgurRequest('yaoi', 5));
@@ -323,10 +334,10 @@ client.on('message', message => {
                 message.channel.send(imgurRequest('yuri', 5));
                 break;
             case 'neko':
-                message.channel.send(imgurRequest('Nekomimi', 5));
+                message.channel.send((Math.floor(Math.random() * 2) == 0) ? imgurRequest('Nekomimi', 5) : subredditRequest('Nekomimi', 5));
                 break;
-            case 'hgif':
-                message.channel.send(imgurRequest('nsfwanimegifs', 5));
+            case 'hgifs':
+                message.channel.send(subredditRequest('nsfwanimegifs', 5));
                 break;
 
             // Voice commands