Added better ogg handling