Merge from Justin's sound code
I hope it is fixed now!