In progress, fixing audio bugs