General bug fix and sound integration