Added sound and fixed some sound related issues
Merge branch 'soundstuff'