Matchtime partially fixed.
Playlist no longer gets stuck on the end