diff --git a/webmusic.js b/webmusic.js
index 5e8f819..ef1ab48 100644
--- a/webmusic.js
+++ b/webmusic.js
@@ -80,7 +80,6 @@ const initState = () => {
 	});
 
 	audioPlayer.addEventListener("ended", function () {
-		console.log("end track: " + index);
 		setPlayerState("idle");
 		nextTrack();
 	});
@@ -142,7 +141,6 @@ const updateButtonState = () => {
 
 
 const playSong = (id) => {
-	console.log("track id:" +id)
 	let element = document.getElementById(id);
 
 	if (element === null) return;
@@ -155,11 +153,11 @@ const playSong = (id) => {
 	index = element.id;
 
 	audioPlayer.pause()
+
 	audioPlayer.src = element.href;
 
 	setPlayerState("loading");
-
-	audioPlayer.loop = repeat;
+	audioPlayer.load();
 	
 	element.classList.add("playing");
 }
@@ -185,27 +183,25 @@ const toggleContinue = () => {
 }
 
 const previousTrack = () => {
+	if (!continuous) return;
 	if (index-- === 0) index = total-1;
 
 	if (document.getElementById(index).classList.contains('dir')) {
 		return previousTrack();
 	}
 
-	if (continuous) {
-		playSong(index)
-	}
+	playSong(index);
 }
 
 const nextTrack = () => {
+	if (!continuous) return;
 	if (++index === total) index = 0;
 
 	if (document.getElementById(index).classList.contains('dir')) {
 		return nextTrack();
 	}
 
-	if (continuous) {
-		playSong(index)
-	}
+	playSong(index);
 }
 
 const formatTime = (secs) => {