fix sound
some cleanups