Add some better mp3 handling