3 files changed, 14 insertions, 11 deletions
diff --git a/src/commands/play.ts b/src/commands/play.ts
index 629a720..30f6314 100644
--- a/src/commands/play.ts
+++ b/src/commands/play.ts
@@ -102,7 +102,11 @@ export default class implements Command {
         }
 
         if (nSongsNotFound !== 0) {
-          extraMsg += `and ${nSongsNotFound.toString()} songs were not found`;
+          if (nSongsNotFound === 1) {
+            extraMsg += 'and 1 song was not found';
+          } else {
+            extraMsg += `and ${nSongsNotFound.toString()} songs were not found`;
+          }
         }
 
         newSongs.push(...convertedSongs);
@@ -140,12 +144,12 @@ export default class implements Command {
       await res.stop(`u betcha, **${firstSong.title}** and ${newSongs.length - 1} other songs were added to the queue${extraMsg}`);
     }
 
-    if (player.voiceConnection === null) {
-      await player.connect(targetVoiceChannel);
-    }
-
     if (queueOldSize === 0 && !wasPlayingSong) {
       // Only auto-play if queue was empty before and nothing was playing
+      if (player.voiceConnection === null) {
+        await player.connect(targetVoiceChannel);
+      }
+
       await player.play();
     }
   }
diff --git a/src/commands/skip.ts b/src/commands/skip.ts
index cc5c1c4..1eb23a0 100644
--- a/src/commands/skip.ts
+++ b/src/commands/skip.ts
@@ -25,19 +25,18 @@ export default class implements Command {
 
   public async execute(msg: Message, _: string []): Promise<void> {
     const queue = this.queueManager.get(msg.guild!.id);
+    const player = this.playerManager.get(msg.guild!.id);
 
     try {
       queue.forward();
+      player.resetPosition();
 
       if (queue.isEmpty() && !queue.getCurrent()) {
-        this.playerManager.get(msg.guild!.id).disconnect();
-      } else {
-        await this.playerManager.get(msg.guild!.id).play();
+        player.disconnect();
       }
 
       await msg.channel.send('keep \'er movin\'');
     } catch (_) {
-      console.log(_);
       await msg.channel.send('no song to skip to');
     }
   }
diff --git a/src/commands/unskip.ts b/src/commands/unskip.ts
index ff4718a..a48d819 100644
--- a/src/commands/unskip.ts
+++ b/src/commands/unskip.ts
@@ -26,11 +26,11 @@ export default class implements Command {
 
   public async execute(msg: Message, _: string []): Promise<void> {
     const queue = this.queueManager.get(msg.guild!.id);
+    const player = this.playerManager.get(msg.guild!.id);
 
     try {
       queue.back();
-
-      await this.playerManager.get(msg.guild!.id).play();
+      player.resetPosition();
 
       await msg.channel.send('back \'er up\'');
     } catch (_) {