diff --git a/.gitignore b/.gitignore
index 5c29cdd..323f042 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-lib/spotify_ripper
+lib/spotify-ripper
 .env
 .token_cache
diff --git a/install.sh b/install.sh
index 77c9d88..11cfb0d 100755
--- a/install.sh
+++ b/install.sh
@@ -8,20 +8,27 @@ if [[ ! $(which python) ]]; then
 	if [[ ! $(which pyenv) ]]; then
 		echo "pyenv installation..."
 		curl -L https://raw.githubusercontent.com/yyuu/pyenv-installer/master/bin/pyenv-installer | bash
+		echo "export PYENV_ROOT=\"$HOME/.pyenv\"" >> $HOME/.bashrc
+		echo "command -v pyenv >/dev/null || export PATH=\"$PYENV_ROOT/bin:$PATH\"" >> $HOME/.bashrc
+		echo "eval \"$(pyenv init -)\"" >> $HOME/.bashrc
 		echo "Restat terminal and relaunch this install script"
 		exit 0
 	fi
 
 	pyenv install 3.9.6
 	pyenv global 3.9.6
+        echo "Restat terminal and relaunch this install script again"
+        exit 0
 fi
 
-sudo apt install lame build-essential libffi-dev jq curl
+sudo apt install -y lame build-essential libffi-dev jq curl
 wget -q -O - https://apt.mopidy.com/mopidy.gpg | sudo apt-key add - #add mopidy's libspotify repository
 sudo wget -q -O /etc/apt/sources.list.d/mopidy.list https://apt.mopidy.com/stretch.list   #valid for Debian Stretch.
-sudo apt update && sudo apt install libspotify12 libspotify-dev python-spotify #install libspotify from mopidy's repository
+sudo apt update && sudo apt install libspotify12 libspotify-dev #install libspotify from mopidy's repository
 mkdir -p lib
 [[ ! -f .env ]] && cp .env.template .env && chmod 600 .env
 
-git clone https://github.com/lavolp3/spotify-ripper.git lib/spotify-ripper && cd lib/spotify-ripper && python setup.py install
+git clone https://github.com/migo1271/spotify-ripper.git lib/spotify-ripper && cd lib/spotify-ripper && sudo python setup.py install
 pyenv rehash
+
+## Source: https://github.com/migo1271/spotify-ripper
diff --git a/spotify-dl.sh b/spotify-dl.sh
index d6fb5b2..af636cc 100755
--- a/spotify-dl.sh
+++ b/spotify-dl.sh
@@ -32,5 +32,5 @@ else
 fi
 
 ## Start download
-SPOTIPY_CLIENT_ID="" SPOTIPY_CLIENT_SECRET="" SPOTIPY_REDIRECT_URI="" python lib/spotify_ripper/spotify_ripper/main.py -k .spotify_appkey.key -u "$sp_id" -p "$sp_password" $link -f "$output/$format"
+SPOTIPY_CLIENT_ID="" SPOTIPY_CLIENT_SECRET="" SPOTIPY_REDIRECT_URI="" python lib/spotify-ripper/spotify_ripper/main.py -k .spotify_appkey.key -u "$sp_id" -p "$sp_password" $link -f "$output/$format"
 rm -f /tmp/list_links.txt