Fixed various sound bugs
Merge branch 'masterfix' into evenMoreBugFixes
Merge pull request #31 from ranleung/evenMoreBugFixes

Even more bug fixes