Using both mp3 and wav
Fixed some bug stuff
merged