* Fixed problem with 2D sound mode
* More work on sound
* Minor changes to cmake files