Bug fixes and expanf gong into other sound options