diff --git a/app/build.gradle b/app/build.gradle
index 2cc7d02..4a18004 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
         applicationId "eu.zderadicka.audioserve"
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 13
-        versionName "0.6.6"
+        versionCode 14
+        versionName "0.6.7"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5f09e52..e9cc944 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         <service
             android:name=".AudioService"
             android:enabled="true"
-            android:exported="false">
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.media.browse.MediaBrowserService" />
             </intent-filter>
diff --git a/app/src/main/java/eu/zderadicka/audioserve/AudioService.kt b/app/src/main/java/eu/zderadicka/audioserve/AudioService.kt
index cf3b325..2e64b79 100644
--- a/app/src/main/java/eu/zderadicka/audioserve/AudioService.kt
+++ b/app/src/main/java/eu/zderadicka/audioserve/AudioService.kt
@@ -130,6 +130,11 @@ class AudioService : MediaBrowserServiceCompat() {
 
         }
 
+        override fun onSeekTo(player: Player?, position: Long) {
+            previousPositionUpdateTime = 0
+            super.onSeekTo(player, position)
+        }
+
         override fun onPlay(player: Player) {
             Log.d(LOG_TAG, "Playback started")
             val autoRewind = calcAutoRewind()
@@ -184,7 +189,8 @@ class AudioService : MediaBrowserServiceCompat() {
         previousPositionUpdateTime = 0
         val updatedBefore = System.currentTimeMillis() - prevPos
         Log.d(LOG_TAG,"Determine autorewind for item ${currentMediaItem}, updated before${updatedBefore}")
-        return if  (updatedBefore < 5* MINUTE_IN_MILLIS) 2000
+        return if  (updatedBefore < 10_000) 0
+            else if  (updatedBefore < 5* MINUTE_IN_MILLIS) 2000
             else if (updatedBefore < 30 * MINUTE_IN_MILLIS) 15_000
             else if (updatedBefore < YEAR_IN_MILLIS) 30_000
             else 0
@@ -477,7 +483,7 @@ class AudioService : MediaBrowserServiceCompat() {
                 preparer.sourceFactory = null
             }
             "pref_autorewind" -> {
-                enableAutoRewind = sharedPreferences.getBoolean("pref_autorewind", false)
+                enableAutoRewind = sharedPreferences.getBoolean("pref_autorewind", true)
             }
         }
     }
@@ -504,7 +510,7 @@ class AudioService : MediaBrowserServiceCompat() {
         super.onCreate()
         preloadFiles = PreferenceManager.getDefaultSharedPreferences(this).getString("pref_preload","2").toInt()
         isOffline = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("pref_offline",false)
-        enableAutoRewind = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("pref_autorewind", false)
+        enableAutoRewind = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("pref_autorewind", true)
         session = MediaSessionCompat(this, LOG_TAG)
         session.controller.registerCallback(sessionCallback)
         player = ExoPlayerFactory.newSimpleInstance(this, DefaultTrackSelector())
diff --git a/app/src/main/java/eu/zderadicka/audioserve/SettingsActivity.kt b/app/src/main/java/eu/zderadicka/audioserve/SettingsActivity.kt
index 4dc1f05..37c9945 100644
--- a/app/src/main/java/eu/zderadicka/audioserve/SettingsActivity.kt
+++ b/app/src/main/java/eu/zderadicka/audioserve/SettingsActivity.kt
@@ -215,7 +215,7 @@ class SettingsFragment: PreferenceFragment(), SharedPreferences.OnSharedPreferen
             }
             "pref_autorewind" -> {
                 if (pref !is CheckBoxPreference) return
-                val checked = sps.getBoolean("pref_autorewind", false)
+                val checked = sps.getBoolean("pref_autorewind", true)
                 if (checked) {
                     pref.summary=getString(R.string.pref_autorewind_selected_title)
 
diff --git a/app/src/main/java/eu/zderadicka/audioserve/data/Model.kt b/app/src/main/java/eu/zderadicka/audioserve/data/Model.kt
index ad4ae68..3f5f740 100644
--- a/app/src/main/java/eu/zderadicka/audioserve/data/Model.kt
+++ b/app/src/main/java/eu/zderadicka/audioserve/data/Model.kt
@@ -9,6 +9,8 @@ import eu.zderadicka.audioserve.utils.splitExtension
 import java.io.File
 
 const val METADATA_KEY_DURATION = MediaMetadataCompat.METADATA_KEY_DURATION
+const val METADATA_KEY_TITLE = MediaMetadataCompat.METADATA_KEY_TITLE
+const val METADATA_KEY_ARTIST = MediaMetadataCompat.METADATA_KEY_ARTIST
 const val METADATA_KEY_LAST_POSITION = "eu.zderadicka.audioserve.last_position"
 const val METADATA_KEY_BITRATE = "eu.zderadicka.audioserve.bitrate"
 const val METADATA_KEY_TRANSCODED = "eu.zderadicka.audioserve.transcoded"
@@ -88,10 +90,11 @@ class AudioFolder(name: String, path: String, val subfolders: ArrayList<Subfolde
         val extras = Bundle()
         val mediaId = prefixPath(f.path, ITEM_TYPE_AUDIOFILE)
         val (name, ext) = splitExtension(f.name)
+        val album = File(f.path).parent
         val descBuilder = MediaDescriptionCompat.Builder()
                 .setMediaId(mediaId)
                 .setTitle(name)
-                .setSubtitle(File(f.path).parent)
+                .setSubtitle(album)
         if (ext != null) {
             extras.putString(METADATA_KEY_EXTENSION, ext)
         }
@@ -102,6 +105,10 @@ class AudioFolder(name: String, path: String, val subfolders: ArrayList<Subfolde
         if (cache != null && cache.isCached(mediaId)) {
             extras.putBoolean(METADATA_KEY_CACHED, true)
         }
+        //this is needed for proper presentation to other MediaSession clients as Lock screen ...
+        extras.putString(METADATA_KEY_TITLE, name)
+        extras.putString(METADATA_KEY_ARTIST, album)
+
         descBuilder.setExtras(extras)
         val item =  MediaItem(descBuilder.build(), MediaItem.FLAG_PLAYABLE)
         if (cache?.shouldTranscode(item) != null) {
diff --git a/app/src/main/java/eu/zderadicka/audioserve/notifications/NotificationsManager.kt b/app/src/main/java/eu/zderadicka/audioserve/notifications/NotificationsManager.kt
index fa4d809..c8cbb73 100644
--- a/app/src/main/java/eu/zderadicka/audioserve/notifications/NotificationsManager.kt
+++ b/app/src/main/java/eu/zderadicka/audioserve/notifications/NotificationsManager.kt
@@ -23,39 +23,46 @@ import eu.zderadicka.audioserve.data.METADATA_KEY_MEDIA_ID
 
 class NotificationsManager(private val mService: AudioService) {
 
-    private val playAction: NotificationCompat.Action
-    private val pauseAction: NotificationCompat.Action
-    private val nextAction: NotificationCompat.Action
-    private val prevAction: NotificationCompat.Action
+    private val playAction= NotificationCompat.Action(
+            R.drawable.ic_play_white,
+            mService.getString(R.string.label_play),
+            MediaButtonReceiver.buildMediaButtonPendingIntent(
+                    mService,
+                    PlaybackStateCompat.ACTION_PLAY))
+    private val pauseAction = NotificationCompat.Action(
+            R.drawable.ic_pause_white,
+            mService.getString(R.string.label_pause),
+            MediaButtonReceiver.buildMediaButtonPendingIntent(
+                    mService,
+                    PlaybackStateCompat.ACTION_PAUSE))
+    private val nextAction = NotificationCompat.Action(
+            R.drawable.ic_next_white,
+            mService.getString(R.string.label_next),
+            MediaButtonReceiver.buildMediaButtonPendingIntent(
+                    mService,
+                    PlaybackStateCompat.ACTION_SKIP_TO_NEXT))
+    private val prevAction = NotificationCompat.Action(
+            R.drawable.ic_previous_white,
+            mService.getString(R.string.label_previous),
+            MediaButtonReceiver.buildMediaButtonPendingIntent(
+                    mService,
+                    PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS))
+    private val rewindAction= NotificationCompat.Action(
+            R.drawable.ic_rewind_white,
+            mService.getString(R.string.label_rewind),
+            MediaButtonReceiver.buildMediaButtonPendingIntent(
+                    mService,
+                    PlaybackStateCompat.ACTION_REWIND))
+    private val forwardAction= NotificationCompat.Action(
+            R.drawable.ic_forward_white,
+            mService.getString(R.string.label_forward),
+            MediaButtonReceiver.buildMediaButtonPendingIntent(
+                    mService,
+                    PlaybackStateCompat.ACTION_FAST_FORWARD))
+
     private val notificationManager: NotificationManager = mService.getSystemService(Context.NOTIFICATION_SERVICE)!! as NotificationManager
 
     init {
-
-        playAction = NotificationCompat.Action(
-                R.drawable.ic_play_white,
-                mService.getString(R.string.label_play),
-                MediaButtonReceiver.buildMediaButtonPendingIntent(
-                        mService,
-                        PlaybackStateCompat.ACTION_PLAY))
-        pauseAction = NotificationCompat.Action(
-                R.drawable.ic_pause_white,
-                mService.getString(R.string.label_pause),
-                MediaButtonReceiver.buildMediaButtonPendingIntent(
-                        mService,
-                        PlaybackStateCompat.ACTION_PAUSE))
-        nextAction = NotificationCompat.Action(
-                R.drawable.ic_next_white,
-                mService.getString(R.string.label_next),
-                MediaButtonReceiver.buildMediaButtonPendingIntent(
-                        mService,
-                        PlaybackStateCompat.ACTION_SKIP_TO_NEXT))
-        prevAction = NotificationCompat.Action(
-                R.drawable.ic_previous_white,
-                mService.getString(R.string.label_previous),
-                MediaButtonReceiver.buildMediaButtonPendingIntent(
-                        mService,
-                        PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS))
-
         // Cancel all notifications to handle the case where the Service was killed and
         // restarted by the system.
         notificationManager.cancelAll()
@@ -105,9 +112,18 @@ class NotificationsManager(private val mService: AudioService) {
             playIndex+=1
         }
 
+        if (state.actions and PlaybackStateCompat.ACTION_SEEK_TO != 0L) {
+            builder.addAction(rewindAction)
+            playIndex+=1
+        }
+
         builder.addAction(if (state.state != PlaybackStateCompat.STATE_PLAYING) playAction else pauseAction)
 
-        // If skip to prev action is enabled.
+        if (state.actions and PlaybackStateCompat.ACTION_SEEK_TO != 0L) {
+            builder.addAction(forwardAction)
+        }
+
+
         if (state.actions and PlaybackStateCompat.ACTION_SKIP_TO_NEXT != 0L) {
             builder.addAction(nextAction)
         }
@@ -137,6 +153,7 @@ class NotificationsManager(private val mService: AudioService) {
                         mService, PlaybackStateCompat.ACTION_STOP))
                 // Show controls on lock screen even when user hides sensitive content.
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                .setPriority(NotificationCompat.PRIORITY_DEFAULT)
 
         return builder
     }
@@ -149,7 +166,7 @@ class NotificationsManager(private val mService: AudioService) {
             val name = "Audioserve"
             // The user-visible description of the channel.
             val description = "Audioserve playback notification channel"
-            val importance = NotificationManager.IMPORTANCE_LOW
+            val importance = NotificationManager.IMPORTANCE_DEFAULT
             val mChannel = NotificationChannel(CHANNEL_ID, name, importance)
             // Configure the notification channel.
             mChannel.description = description
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d7c0b16..35bddbb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,4 +85,6 @@
     <string name="pref_autorewind_title">Auto Rewind</string>
     <string name="pref_autorewind_unselected_title">No auto rewind, playback will start exactly where it was paused</string>
     <string name="pref_autorewind_selected_title">Before continuing playback it\'\'ll be rewind by a small amount (2s-30s), depending how long it was paused</string>
+    <string name="label_rewind">Rewind</string>
+    <string name="label_forward">Forward</string>
 </resources>