* Fixed a bunch of style issues in the pull request
* Added better error handling for audio stuff