CitrusSound fixes, and Events