code cleanup
ensuring current track is correct for onplay action
Merge branch 'stable'