diff --git a/app/src/main/java/com/example/mear/activities/SettingsActivity.kt b/app/src/main/java/com/example/mear/activities/SettingsActivity.kt
index 5fb2e24..06832bd 100644
--- a/app/src/main/java/com/example/mear/activities/SettingsActivity.kt
+++ b/app/src/main/java/com/example/mear/activities/SettingsActivity.kt
@@ -21,9 +21,11 @@ class SettingsActivity : AppCompatActivity() {
         setContentView(R.layout.activity_settings)
         setSupportActionBar(toolbar)
 
+        /**
         RefreshLibrary.setOnClickListener {
             updateLibrary()
         }
+        */
 
         initialize()
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
diff --git a/app/src/main/java/com/example/mear/playback/service/MusicService.kt b/app/src/main/java/com/example/mear/playback/service/MusicService.kt
index ffa698a..6079b54 100644
--- a/app/src/main/java/com/example/mear/playback/service/MusicService.kt
+++ b/app/src/main/java/com/example/mear/playback/service/MusicService.kt
@@ -22,10 +22,14 @@ import com.example.mear.repositories.TrackRepository
 
 class MusicService: Service() {
 
+    companion object {
+        //fun curSongIndex(): Int = currentSongIndex
+    }
+
     private var trackPlayer: MediaPlayer? = null
     private  var currentSongIndex: Int? = null
     private var shuffleOn: Boolean? = null
-    private var repeatOn: Boolean? = false
+    private var repeatOn: Boolean? = null
     private val mBinder = LocalBinder()
     private val seconds = 4
 
@@ -66,6 +70,7 @@ class MusicService: Service() {
     }
 
     fun playTrack(id: Int) {
+        currentSongIndex = id
         trackPlayer!!.reset()
         trackPlayer!!.setDataSource(TrackRepository(this).getTrack(id).songPath)
         trackPlayer!!.prepare()