removed some of blah's stuff, unfinished OGG support