diff --git a/utils/Player.js b/utils/Player.js
index d08e693..5c14998 100644
--- a/utils/Player.js
+++ b/utils/Player.js
@@ -1,234 +1,222 @@
 .import org.kde.mauikit 1.0 as Maui
 
 function playTrack(index)
 {
     if((index < mainPlaylist.listView.count) && (mainPlaylist.listView.count > 0) && (index > -1))
     {
         currentTrack = mainPlaylist.list.get(index)
 
         if(typeof(currentTrack) === "undefined") return
 
         if(Maui.FM.fileExists(currentTrack.url))
         {
             player.url = currentTrack.url;
             player.playing = true
 
 
             if(currentTrack.artwork && currentTrack.artwork.length && currentTrack.artwork !== "NONE")
                 currentArtwork =  currentTrack.artwork
             //            else bae.loadCover(currentTrack.url)
 
             progressBar.enabled = true
 
             if(!isMobile)
             {
                 root.title = currentTrack.title + " - " +currentTrack.artist
 
                 //                if(!root.active)
                 //                    bae.notifySong(currentTrack.url)
             }
 
             //            if(currentTrack.lyrics.length < 1)
             //                            bae.trackLyrics(currentTrack.url)
 
             //    root.mainPlaylist.infoView.wikiAlbum = bae.albumWiki(root.mainPlaylist.currentTrack.album,root.mainPlaylist.currentTrack.artist)
             //    root.mainPlaylist.infoView.wikiArtist = bae.artistWiki(root.mainPlaylist.currentTrack.artist)
             //    //    root.mainPlaylist.infoView.artistHead = bae.artistArt(root.mainPlaylist.currentTrack.artist)
         }else missingAlert(currentTrack)
     }
 }
 
 function queueTracks(tracks)
 {    
     if(tracks && tracks.length > 0)
     {
         appendTracksAt(tracks, currentTrackIndex+onQueue+1)
         onQueue++
         root.notify("", "Queue", tracks.length + " tracks added put on queue")
     }
 }
 
 function setLyrics(lyrics)
 {
     currentTrack.lyrics = lyrics
     infoView.lyricsText.text = lyrics
 }
 
 function stop()
 {
     player.stop()
     progressBar.value = 0
     progressBar.enabled = false
     root.title = "Babe..."
 }
 
 function pauseTrack()
 {
     player.playing = false
 }
 
 function resumeTrack()
 {    
     if(!player.play() && !mainlistEmpty)
         playAt(0)
 }
 
 function nextTrack()
 {
     if(!mainlistEmpty)
     {
         var next = 0
         if(isShuffle && onQueue === 0)
             next = shuffle()
         else
             next = currentTrackIndex+1 >= mainPlaylist.listView.count? 0 : currentTrackIndex+1
 
         prevTrackIndex = mainPlaylist.listView.currentIndex
         playAt(next)
 
         if(onQueue > 0)
         {
             onQueue--
             console.log(onQueue)
         }
     }
 }
 
 function previousTrack()
 {
     if(!mainlistEmpty)
     {
         var previous = previous = currentTrackIndex-1 >= 0 ? mainPlaylist.listView.currentIndex-1 : currentTrackIndex-1
         prevTrackIndex = mainPlaylist.listView.currentIndex
         playAt(previous)
     }
 }
 
 function shuffle()
 {
     var pos =  Math.floor(Math.random() * mainPlaylist.listView.count)
     return pos
 }
 
 function playAt(index)
 {
     if((index < mainPlaylist.listView.count) && (index > -1))
     {
         currentTrackIndex = index
         mainPlaylist.listView.currentIndex = currentTrackIndex
         mainPlaylist.albumsRoll.positionAlbum(currentTrackIndex)
         playTrack(currentTrackIndex)
     }
 }
 
 function quickPlay(track)
 {
     //    root.pageStack.currentIndex = 0
     appendTrack(track)
     playAt(mainPlaylist.listView.count-1)
     mainPlaylist.listView.positionViewAtEnd()
     mainPlaylist.albumsRoll.positionViewAtEnd()
 
 }
 
 function appendTracksAt(tracks, at)
 {
     if(tracks)
         for(var i in tracks)
             mainPlaylist.list.append(tracks[i], parseInt(at)+parseInt(i))
 }
 
 function appendTrack(track)
 {
     if(track)
     {
         mainPlaylist.list.append(track)
         if(sync === true)
         {
             infoMsgAnim()
             //            addToPlaylist([track.url], syncPlaylist)
         }
     }
-
-    //    if(track)
-    //    {
-    //        var empty = root.mainPlaylist.list.count
-    //        if((empty > 0 && track.url !== root.mainPlaylist.list.model.get(root.mainPlaylist.list.count-1).url) || empty === 0)
-    //        {
-    //            root.mainPlaylist.list.model.append(track)
-
-    //            if(empty === 0 && root.mainPlaylist.list.count>0)
-    //                playAt(0)
-    //        }
-    //    }
 }
 
 function addTrack(track)
 {
     if(track)
     {
         appendTrack(track)
         mainPlaylist.listView.positionViewAtEnd()
     }
 }
 
 function appendAll(tracks)
 {
     if(tracks)
     {
         for(var i in tracks)
             appendTrack(tracks[i])
 
         mainPlaylist.listView.positionViewAtEnd()
     }
 }
 
 function savePlaylist()
 {
     var list = []
     var n =  mainPlaylist.listView.count
     n = n > 15 ? 15 : n
 
     for(var i=0 ; i < n; i++)
     {
         var url = mainPlaylist.list.get(i).url
         list.push(url)
     }
 
     Maui.FM.saveSettings("LASTPLAYLIST", list, "PLAYLIST");
     Maui.FM.saveSettings("PLAYLIST_POS", mainPlaylist.listView.currentIndex, "MAINWINDOW")
 }
 
 
 function clearOutPlaylist()
 {
     mainPlaylist.list.clear()
     stop()
 }
 
 function cleanPlaylist()
 {
     var urls = []
 
     for(var i = 0; i < mainPlaylist.listView.count; i++)
     {
         var url = mainPlaylist.list.get(i).url
 
         if(urls.indexOf(url)<0)
             urls.push(url)
         else mainPlaylist.list.remove(i)
     }
 }
 
 function playAll()
 {
     sync = false
     syncPlaylist = ""
     infoMsg = ""
 
     if(_drawer.modal && !_drawer.visible)
         _drawer.visible = true
 
     mainPlaylist.listView.positionViewAtBeginning()
     playAt(0)
 }