diff --git a/yps.py b/yps.py
index 6145487..00ece79 100755
--- a/yps.py
+++ b/yps.py
@@ -5,7 +5,8 @@
 import os
 import json
 import subprocess
-
+import shutil
+import time
 
 YOUTUBE_DL_PATH = 'youtube-dl'
 CONFIG_FILENAME = 'yps.json'
@@ -18,12 +19,12 @@ def run_in_subprocess(args):
     print_info(' '.join(args))
     subprocess.call(args)
 
-def save_config(directory, playlist_url):
+def save_config(directory, playlist_url, fileformat=None):
     config_loc = os.path.expanduser(os.path.join(directory, CONFIG_FILENAME))
     if os.path.exists(config_loc):
         exit('Configuration at ' + config_loc + ' already exists. Not saving new config.')
 
-    config_data = {'youtube_playlist': playlist_url}
+    config_data = {'directory': directory,'youtube_playlist': playlist_url, 'format': fileformat}
 
     save_config_data(config_loc, config_data)
     print_info('Saved config to ' + config_loc)
@@ -43,15 +44,20 @@ def sync_playlist(config_path):
         print_info('Config path does not exist')
         return False
 
-    config_data =get_config(config_path)
+    config_data = get_config(config_path)
 
     current_dir = os.getcwd()  # save dir to change back to it later
     os.chdir(os.path.dirname(config_path))  # change dir to the one you want to save the videos to
 
-    if 'format' in config_data:
-        run_in_subprocess([YOUTUBE_DL_PATH, '-f', config_data['format'], config_data['youtube_playlist']])
+    if config_data['format'] != None:
+        if shutil.which('ffmpeg') == None:
+            print_info('ffmpeg must be installed for mp3 downloads. Read this guide for help installing ffmpeg for Windows: https://bit.ly/3eoW2MD.')
+            time.sleep(5000)
+            exit()
+        else:
+            run_in_subprocess([YOUTUBE_DL_PATH, '--extract-audio', '--audio-format', config_data['format'], '-o', config_data['directory'] + r'\%(title)s.%(ext)s', config_data['youtube_playlist']])
     else:
-        run_in_subprocess([YOUTUBE_DL_PATH, config_data['youtube_playlist']])
+        run_in_subprocess([YOUTUBE_DL_PATH, config_data['youtube_playlist'], '-o', config_data['directory'] + r'\%(title)s.%(ext)s'])
 
     os.chdir(current_dir)  # change back to original dir
 
@@ -84,8 +90,9 @@ def sync_playlist(config_path):
 elif args.init:
     new_youtube_playlist = args.init
     save_dir = args.dir
+    save_format = args.format
 
-    save_config(save_dir, new_youtube_playlist)
+    save_config(save_dir, new_youtube_playlist, save_format)
 
 elif args.format:
     yps_config_loc = os.path.join(args.dir, CONFIG_FILENAME)
@@ -97,4 +104,4 @@ def sync_playlist(config_path):
 
 
 else:
-    parser.print_help()
\ No newline at end of file
+    parser.print_help()